summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-08179-1055/+2665
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (70 commits) Fix routing spec for group controller Add small improvements to constrainers and specs Faster search Fix broken commits search Changed helper method to check for none on params Moved if statements around in view API: Return 400 when creating a systemhook fails Update non-exist group spinach test to match routing Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2 Replace trigger with the new ID of the docs project Refactor method name 17492 Update link color for more accessible contrast Fixed todos empty state when filtering Refactor namespace regex implements reset incoming email token on issues modal and account page, reactivates all tests and writes more tests for it Use separate email-friendly token for incoming email and let incoming email token be reset Use the Gitlab Workhorse HTTP header in the admin dashboard Refactor project routing Fix 404 when visit /projects page Rewritten spinach git_blame tests to rspec feature tests Add tests for project#index routing ...
| * Merge branch 'faster_project_search' into 'master' Sean McGivern2016-11-084-18/+33
| |\ | | | | | | | | | | | | Faster search inside Project See merge request !7353
| | * Faster searchfaster_project_searchValery Sizov2016-11-084-18/+33
| | |
| * | Merge branch 'fix-new-branch-button-spec' into 'master' Sean McGivern2016-11-081-3/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix new branch button spec Closes #24089. See merge request !7284
| | * | Fix new branch button specfix-new-branch-button-specSean McGivern2016-11-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. We can create the note directly on the issue, rather than attaching it after creation. 2. We need to update the MergeRequestClosesIssues relation to ensure that the issue know that it's closed by the MR. 3. We should also check that the unavailable button is displayed - not just that the available button is displayed.
| * | | Merge branch 'dz-refactor-contraints' into 'master' Dmitriy Zaporozhets2016-11-089-76/+83
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor routing constraints ## What does this MR do? Refactors routing constraints ## Why was this MR needed? This refactoring make it possible to introduce nesting namespaces and project constrainer in future. ## What are the relevant issue numbers? Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121/ See merge request !7327
| | * | | Fix routing spec for group controllerdz-refactor-contraintsDmitriy Zaporozhets2016-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Add small improvements to constrainers and specsDmitriy Zaporozhets2016-11-084-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Refactor routing constraintsDmitriy Zaporozhets2016-11-078-74/+81
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch '24255-search-fix' into 'master' Rémy Coutable2016-11-087-2/+66
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken commits search ## What does this MR do? Fixes commits search ## What are the relevant issue numbers? Closes #24255 See merge request !7339
| | * | | | Fix broken commits search24255-search-fixValery Sizov2016-11-087-2/+66
| | | | | |
| * | | | | Merge branch 'move-boards-interceptor' into 'master' Fatih Acet2016-11-083-108/+116
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Ajax interceptor into describe block ## What does this MR do? Move registering the Vue resource interceptor for issue board mock data into the corresponding `describe` blocks. ## Why was this MR needed? Currently, the interceptor is registered for every test (which makes them at best fail for Ajax calls using Vue resource). See merge request !7304
| | * | | | | Move Ajax interceptor into describe block (!7304)winniehell2016-11-053-108/+116
| | | | | | |
| * | | | | | Merge branch 'dz-refactor-project-routes' into 'master' Dmitriy Zaporozhets2016-11-086-183/+176
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor project routing ## What does this MR do? Refactor project routing: * split on multiple files * improve routing order ## Why was this MR needed? It makes it easier to maintain and modify project routing ## What are the relevant issue numbers? Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121 See merge request !7329
| | * | | | | | Refactor project routingdz-refactor-project-routesDmitriy Zaporozhets2016-11-076-183/+176
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * split on multiple files * improve routing order Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Merge branch 'dz-refactor-namespace-regex' into 'master' Sean McGivern2016-11-084-24/+29
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor namespace regex Reuse existing namespace regex constant in routing See merge request !7336
| | * | | | | | Update non-exist group spinach test to match routingDmitriy Zaporozhets2016-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Refactor namespace regexdz-refactor-namespace-regexDmitriy Zaporozhets2016-11-073-23/+28
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Merge branch 'sidekiq_default_retries' into 'master' Yorick Peterse2016-11-082-0/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set default Sidekiq retries to 3 See merge request !7294
| | * | | | | | Set default Sidekiq retries to 3Drew Blessing2016-11-042-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, Sidekiq will retry 25 times with an exponential backoff. This may result in jobs retrying for up to 21 days. Most Sidekiq failures occur when attempting to connect to external services - Project service hooks, web hooks, mailers, mirror updates, etc. We should set a default retry of 3, and if that's not sufficient individual workers can override this in the worker class.
| * | | | | | | Merge branch 'dz-refactor-group-routes' into 'master' Dmitriy Zaporozhets2016-11-081-19/+19
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor group routing ## What does this MR do? Refactor group routing: * separate controller actions from nested resources * prepare group routing for nested namespaces support ## Why was this MR needed? So when we introduce nested groups support we need to only change `:id` to `*id` ## What are the relevant issue numbers? Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121 See merge request !7328
| | * | | | | | Refactor group routingdz-refactor-group-routesDmitriy Zaporozhets2016-11-071-19/+19
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * separate controller actions from nested resources * prepare group routing for nested namespaces support Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Merge branch 'sh-bump-omniauth-gitlab' into 'master' Robert Speicher2016-11-083-3/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2 As noted in gitlab-com/support-forum#1270, omniauth-gitlab fails if omniauth-oauth2 is bumped to 1.4.0, OAuth2 quietly fails due to https://github.com/linchus/omniauth-gitlab/issues/10: ``` 21:26:04 rails-web.1 | I, [2016-11-07T21:26:04.245007 #56637] INFO -- omniauth: (gitlab) Callback phase initiated. 21:26:05 rails-web.1 | E, [2016-11-07T21:26:05.068009 #56637] ERROR -- omniauth: (gitlab) Authentication failure! invalid_credentials: OAuth2::Error, invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client. ``` This was fixed and discussed here: * https://github.com/linchus/omniauth-gitlab/commit/26c47e55396205fab8439363c98136d0fde797f3 * https://github.com/linchus/omniauth-gitlab/issues/10 Bumping this version to 1.0.2 will ensure future compatibility. See merge request !7348
| | * | | | | | Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2sh-bump-omniauth-gitlabStan Hu2016-11-073-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitlab-com/support-forum#1270
| * | | | | | | Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-0826-60/+230
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use separate email-friendly token for incoming email See merge request !5914
| | * | | | | | | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-0722-59/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reactivates all tests and writes more tests for it
| | * | | | | | | Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-0712-34/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | email token be reset
| * | | | | | | | Merge branch 'todos-filter-empty-state' into 'master' Sean McGivern2016-11-082-9/+17
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed todos empty state when filtering Closes #24127 See merge request !7334
| | * | | | | | | | Changed helper method to check for none on paramsPhil Hughes2016-11-082-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved if statements around in view
| | * | | | | | | | Fixed todos empty state when filteringtodos-filter-empty-statePhil Hughes2016-11-072-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #24127
| * | | | | | | | | Merge branch 'dz-fix-project-index' into 'master' Sean McGivern2016-11-083-3/+24
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project index page See merge request !7331
| | * | | | | | | | | Fix 404 when visit /projects pagedz-fix-project-indexDmitriy Zaporozhets2016-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | | Add tests for project#index routingDmitriy Zaporozhets2016-11-071-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | | Fix project indexDmitriy Zaporozhets2016-11-071-3/+3
| | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Merge branch 'fix-systemhook-api' into 'master' Rémy Coutable2016-11-083-1/+11
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Return 400 when creating a systemhook fails Closes #23335 See merge request !7350
| | * | | | | | | | | API: Return 400 when creating a systemhook failsRobert Schilling2016-11-083-1/+11
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'fix-404-on-network-when-entering-a-nonexistent-git-revision' ↵Sean McGivern2016-11-087-14/+33
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Network page appear with an error message when entering nonexistent git revision Closes #2362 See merge request !7172
| | * | | | | | | | | Refactor method nameHiroyuki Sato2016-11-081-2/+2
| | | | | | | | | | |
| | * | | | | | | | | Fix bug of json request urlHiroyuki Sato2016-11-072-4/+11
| | | | | | | | | | |
| | * | | | | | | | | Remove 'extended_sha1' option from ExtractsPath moduleHiroyuki Sato2016-11-063-13/+10
| | | | | | | | | | |
| | * | | | | | | | | Update changelogHiroyuki Sato2016-11-062-34/+4
| | | | | | | | | | |
| | * | | | | | | | | Fix spinach testHiroyuki Sato2016-11-062-1/+5
| | | | | | | | | | |
| | * | | | | | | | | Add a CHANGELOG entryHiroyuki Sato2016-11-061-0/+34
| | | | | | | | | | |
| | * | | | | | | | | Separete a very long lineHiroyuki Sato2016-11-061-1/+3
| | | | | | | | | | |
| | * | | | | | | | | Network page appear with an error message when entering nonexistent git revisionHiroyuki Sato2016-11-064-5/+10
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'change-docs-trigger-id' into 'master' Achilleas Pipinellis2016-11-071-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace trigger with the new ID of the docs project Now that the old docs site is deprecated in favor of https://gitlab.com/gitlab-com/gitlab-docs See merge request !7343
| | * | | | | | | | | Replace trigger with the new ID of the docs projectAchilleas Pipinellis2016-11-071-1/+1
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | Merge branch '17492-link-contrast' into 'master' Annabel Dunstone Gray2016-11-074-16/+16
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17492 Update link color for more accessible contrast ## What does this MR do? Improves contrast of links to pass accessibility contrast checker http://webaim.org/resources/contrastchecker/ ## Screenshots (if relevant) Before: ![Screen_Shot_2016-11-07_at_11.09.44_AM](/uploads/233c53cd81436a00f0cc7f826ca900df/Screen_Shot_2016-11-07_at_11.09.44_AM.png) After: ![Screen_Shot_2016-11-07_at_11.09.22_AM](/uploads/698ac990d61434893709a3cea78896d9/Screen_Shot_2016-11-07_at_11.09.22_AM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #17492 See merge request !7340
| | * | | | | | | | 17492 Update link color for more accessible contrast17492-link-contrasttauriedavis2016-11-074-16/+16
| |/ / / / / / / /
| * | | | | | | | Merge branch ↵Rémy Coutable2016-11-074-29/+25
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '23036-replace-git-blame-spinach-tests-with-rspec-feature-tests' into 'master' Rewritten spinach git_blame tests to RSpec feature tests Part of #23036. This MR contains 'git blame' feature tests rewritten in RSpec. See merge request !7197