- 05 Jan, 2016 1 commit
-
-
Douwe Maan authored
Better support for referencing and closing issues in asana_service.rb (by @mikew1) See merge request !2302
-
- 04 Jan, 2016 3 commits
-
-
Robert Speicher authored
-
Robert Speicher authored
Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue. See https://gitlab.com/gitlab-org/gitlab-ce/issues/4130#note_3012511 See merge request !2283
-
Douwe Maan authored
Hotfix note mail with notification
-
- 31 Dec, 2015 2 commits
- 30 Dec, 2015 4 commits
-
-
Douwe Maan authored
Enable "Add key" button when user fills in a proper key Closes #4295 See merge request !2208
-
Robert Speicher authored
Fix project transfer e-mail sending incorrect paths in e-mail notification The introduction of ActiveJob and `deliver_now` in 7f214cee caused a race condition where the mailer would be invoked before the project was committed to the database, causing the transfer e-mail notification to show the old path instead of the new one. Closes #4670 See merge request !2235
-
Robert Speicher authored
Fixes problem with user autocomplete URI ``` Failed to load resource: net::ERR_NAME_NOT_RESOLVED http://autocomplete/users.json?search=&per_page=20&active=true¤t_user=false ``` Fixes #4118, #4136 See merge request !2136
-
Grzegorz Bizon authored
Hotfix for builds trace data integrity Closes #4246 See merge request !2224
-
- 29 Dec, 2015 7 commits
-
-
Robert Speicher authored
[ci skip]
-
Marin Jankovski authored
-
Marin Jankovski authored
Recaptcha to stable See merge request !2236
-
Stan Hu authored
-
Gabriel Mazetto authored
-
Dmitriy Zaporozhets authored
Add support for Google reCAPTCHA in user registration to prevent spammers See merge request !2216
-
Dmitriy Zaporozhets authored
Disable --follow in `git log` to avoid loading duplicate commit data in infinite scroll `git` doesn't work properly when `--follow` and `--skip` are specified together. We could even be **omitting commits in the Web log** as a result. Here are the gory details. Let's say you ran: ``` git log -n=5 --skip=2 README ``` This is the working case since it omits `--follow`. This is what happens: 1. `git` starts at `HEAD` and traverses down the tree until it finds the top-most commit relevant to README. 2. Once this is found, this commit is returned via `get_revision_1()`. 3. If the `skip_count` is positive, decrement and repeat step 2. Otherwise go onto step 4. 4. `show_log()` gets called with that commit. 5. Repeat step 1 until we have all five entries. That's exactly what we want. What happens when you use `--follow`? You have to understand how step 1 is performed: * When you specify a pathspec on the command-line (e.g. README), a flag `prune` [gets set here](https://github.com/git/git/blob/master/revision.c#L2351). * If the `prune` flag is active, `get_commit_action()` determines whether the commit should be [scanned for matching paths](https://github.com/git/git/blob/master/revision.c#L2989). * In the case of `--follow`, however, `prune` is [disabled here](https://github.com/git/git/blob/master/revision.c#L2350). * As a result, a commit is never scanned for matching paths and therefore never pruned. `HEAD` will always get returned as the first commit, even if it's not relevant to the README. * Making matters worse, the `--skip` in the example above would actually skip a every other entry after `HEAD` N times. If README were changed in these skipped commits, we would actually miss information! Since git uses a matching algorithm to determine whether a file was renamed, I believe `git` needs to generate a diff of each commit to do this and traverse each commit one-by-one to do this. I think that's the rationale for disabling the `prune` functionality since you can't just do a simple string comparison. Closes #4181, #4229, #3574, #2410 See merge request !2210
-
- 28 Dec, 2015 1 commit
-
-
Robert Speicher authored
-
- 24 Dec, 2015 5 commits
-
-
Robert Speicher authored
Escape all the things. See merge request !2209
-
Robert Speicher authored
[ci skip]
-
Dmitriy Zaporozhets authored
Fix Error 500 when global milestones have slashes * Closes #4226 * Closes https://github.com/gitlabhq/gitlabhq/issues/9921 See merge request !2182
-
Douwe Maan authored
Fix identity and user retrieval when special characters are used Fixes #4023 I also added tests to make sure the user with special characters in his name is returned correctly. @rspeicher this probably should be added to 8.3 as a patch. See merge request !2176
-
Dmitriy Zaporozhets authored
Fix Error 500 when doing a search in dashboard before visiting any project If a search turned up an issue, under certain conditions you would see this error: ``` ActionView::Template::Error (undefined method `path_with_namespace' for nil:NilClass): 6: - if issue.description.present? 7: .description.term 8: = preserve do 9: = search_md_sanitize(markdown(issue.description)) 10: %span.light 11: #{issue.project.name_with_namespace} 12: - if issue.closed? lib/gitlab/markdown/upload_link_filter.rb:36:in `build_url' lib/gitlab/markdown/upload_link_filter.rb:31:in `process_link_attr' lib/gitlab/markdown/upload_link_filter.rb:18:in `block in call' lib/gitlab/markdown/upload_link_filter.rb:17:in `call' lib/gitlab/markdown.rb:127:in `gfm' lib/gitlab/markdown.rb:24:in `render' app/helpers/gitlab_markdown_helper.rb:61:in `markdown' app/views/search/results/_issue.html.haml:9:in `block in _app_views_search_results__issue_html_haml__4127460390996300432_59973760' app/views/search/results/_issue.html.haml:8:in `_app_views_search_results__issue_html_haml__4127460390996300432_59973760' app/views/search/_results.html.haml:20:in `_app_views_search__results_html_haml__589475855773452465_61761440' app/views/search/show.html.haml:5:in `_app_views_search_show_html_haml___1852335078065998536_69780120' ``` Confirmed this is issue still happens in GitLab 8.4, and it also happens on GitLab.com. Here's how to reproduce: 1. Login in a new browser. 2. Enter a search term on the top right that will land a hit in the "Issues" (e.g. GitLab). 3. Click on "Issues" tab. You should get an Error 500. The issue is that @project isn't assigned to anything. See merge request !2110
-
- 23 Dec, 2015 1 commit
-
-
Grzegorz Bizon authored
Fix method that ensures authentication token Until now, `ensure_#{token_filed_name}!` method didn't persist new token in database. This closes #4235. See merge request !2185
-
- 22 Dec, 2015 6 commits
-
-
Stan Hu authored
Fix and test leave project display The 'Leave this project' display on project page was broken. It was calling the method incorrectly, which returned `nil` and displayed nothing. This fixes the display and also adds 2 different tests for it. cc/ @jvanbaarsen @stanhu Please review and merge if you think it looks good. Thank you! See merge request !2166
-
Gabriel Mazetto authored
-
Dmitriy Zaporozhets authored
Sidekiq-cron configuration moved to gitlab.yml When `sidekiq-cron` was introduced, jobs configuration where placed in `schedule.yml` file. As discussed in #3928, this is not desirable. We moved it to `gitlab.yml`, exposing only the "cron" part of the configuration. See merge request !2087
-
Robert Speicher authored
-
Robert Speicher authored
Fix MR 500 when viewing the MR page Fixes #2712 See merge request !2167
-
Robert Speicher authored
Explicitly require Nokogiri 1.6.7.1 due to security issue ``` Name: nokogiri Version: 1.6.7 Advisory: CVE-2015-5312 Criticality: High URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s Title: Nokogiri gem contains several vulnerabilities in libxml2 Solution: upgrade to >= 1.6.7.1 ``` See merge request !2154
-
- 21 Dec, 2015 6 commits
-
-
Robert Speicher authored
-
Robert Speicher authored
Allow admin to create new user identities Fixes #2442 See merge request !2077
-
Robert Speicher authored
Fix issue related cross-project MRs Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4188 See merge request !2163
-
Robert Speicher authored
Allow account unlock via email We see a lot of users get confused about what it means when your account gets locked. Many try to reset their password and are still faced with a lockout. With this change, users receive an email that allows them to unlock their account immediately. The previous behavior where the account is auto-unlocked after a time also still works. See merge request !2049
-
Robert Speicher authored
-
Dmitriy Zaporozhets authored
Backport JIRA service Fixes #3839 Move EE JIRA functionality back to CE. - [x] Make it function in manual testing - [x] Migrate JIRA-specific tests - [x] Tests pass - [x] Migrate documentation - [x] Rollback to previous CE JIRA integration locally, activate on a project then try to migrate db and see if integration still works. - [x] Final EE search for JIRA references See merge request !2146
-
- 19 Dec, 2015 2 commits
-
-
Achilleas Pipinellis authored
Remove CI_BUILD_BEFORE_SHA from CI documentation As pointed in #3210, the environment variable isn't usable any more. See merge request !2118
-
Achilleas Pipinellis authored
Clarify Windows shell executor artifact upload support @ayufan noted that the runner does not support artifact upload for Windows shell executor. This adds a note so users aren't confused. See merge request !2142
-
- 18 Dec, 2015 2 commits
-
-
Drew Blessing authored
-
Grzegorz Bizon authored
Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled Fixes #3827 Fixes #4157 /cc @grzesiek @dblessing See merge request !2139
-