Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prevent visual token dropdown from opening the wrong filter dropdownfix-visual-tokens | Clement Ho | 2017-03-08 | 5 | -25/+81 |
| | |||||
* | Merge branch 'filtered-search-visual-tokens-improvements' into 'master' | Alfredo Sumaran | 2017-03-08 | 3 | -3/+4 |
|\ | | | | | | | | | Filtered Search Visual Tokens code improvements See merge request !9781 | ||||
| * | Code improvementsfiltered-search-visual-tokens-improvements | Clement Ho | 2017-03-07 | 3 | -3/+4 |
| | | |||||
* | | Merge branch 'add-changelog-filtered-search-visual-tokens' into 'master' | Alfredo Sumaran | 2017-03-08 | 1 | -0/+4 |
|\ \ | | | | | | | | | | | | | Add changelog for filtered-search-visual-tokens See merge request !9799 | ||||
| * | | Add changelog for filtered-search-visual-tokensadd-changelog-filtered-search-visual-tokens | Clement Ho | 2017-03-07 | 1 | -0/+4 |
| | | | |||||
* | | | Merge branch 'fix-fs-edit-dropdown' into 'master' | Alfredo Sumaran | 2017-03-08 | 2 | -3/+21 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix filtered search visual token editing dropdown See merge request !9794 | ||||
| * | | | Fix filtered search visual token editing dropdownfix-fs-edit-dropdown | Clement Ho | 2017-03-07 | 2 | -3/+21 |
| | |/ | |/| | |||||
* | | | Merge branch 'fix-edit-last-visual-token' into 'master' | Alfredo Sumaran | 2017-03-08 | 3 | -6/+19 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix edit last visual token See merge request !9791 | ||||
| * | | | Fix edit last visual tokenfix-edit-last-visual-token | Clement Ho | 2017-03-07 | 3 | -6/+19 |
| |/ / | |||||
* | | | Merge branch 'update_crowd_docs' into 'master' | Achilleas Pipinellis | 2017-03-08 | 4 | -64/+70 |
|\ \ \ | | | | | | | | | | | | | | | | | Move and update Crowd authentication documentation See merge request !9775 | ||||
| * | | | Move and update Crowd authentication documentation | Drew Blessing | 2017-03-07 | 4 | -64/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | Current docs did not include information on configuring the app in Crowd. Also, moved the doc to the new administration/auth directory. | ||||
* | | | | Merge branch 'filtered-search-visual-tokens' into 'master' | Alfredo Sumaran | 2017-03-08 | 32 | -376/+2244 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | Filtered search visual tokens Closes #26652 See merge request !8969 | ||||
| * | | | Add filtered search visual tokensfiltered-search-visual-tokens | Clement Ho | 2017-03-07 | 32 | -376/+2244 |
| | |/ | |/| | |||||
* | | | Merge branch 'patch-15' into 'master' | Achilleas Pipinellis | 2017-03-08 | 1 | -0/+58 |
|\ \ \ | |/ / |/| | | | | | | | | Add configuration instructions for Container Registry Notifications. See merge request !9500 | ||||
| * | | Add configuration instructions for Container Registry Notifications.[ci skip] | Alexandre Gomes | 2017-03-07 | 1 | -0/+58 |
| | | | |||||
* | | | Merge branch 'rs-fix-todo-service-spec' into 'master' | Douwe Maan | 2017-03-08 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix transient failure in TodoService spec See merge request !9797 | ||||
| * | | | Fix transient failure in TodoService spec | Robert Speicher | 2017-03-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For reasons unknown, the lack of `and_call_original` on this message expectation was causing a transient failure depending on test order. We narrowed it down using `rspec --bisect` to the following order: spec/requests/openid_connect_spec.rb:123 spec/services/todo_service_spec.rb:751 | ||||
* | | | | Merge branch 'issue_16834' | Douwe Maan | 2017-03-07 | 10 | -172/+564 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # doc/api/v3_to_v4.md | ||||
| * | | | | Remove unecessary endpoint from repository, add compatibility endpoints for ↵issue_16834 | Felipe Artur | 2017-03-07 | 8 | -120/+330 |
| | | | | | | | | | | | | | | | | | | | | v3 and several improvements | ||||
| * | | | | Update API endpoints for raw files | Felipe Artur | 2017-03-07 | 8 | -145/+328 |
| | | | | | |||||
* | | | | | Merge branch 'dm-nested-groups-go-get' into 'master' | Douwe Maan | 2017-03-08 | 2 | -18/+143 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix go-get support for projects in nested groups See merge request !9793 | ||||
| * | | | | | Fix go-get support for projects in nested groupsdm-nested-groups-go-get | Douwe Maan | 2017-03-07 | 2 | -18/+143 |
| |/ / / / | |||||
* | | | | | Merge branch '1381-present-commits-pagination-headers-correctly' into 'master' | Douwe Maan | 2017-03-08 | 8 | -13/+195 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | GET "projects/:id/repository/commits" endpoint improvements Closes #1381 and #20207 See merge request !9679 | ||||
| * | | | | Returns correct header data for commits endpoint | Oswaldo Ferreira | 2017-03-07 | 10 | -47/+119 |
| | | | | | |||||
| * | | | | Fix pagination headers for repository commits api endpoint | George Andrinopoulos | 2017-03-07 | 4 | -4/+45 |
| | | | | | |||||
| * | | | | Manually set total_count when paginating commits | Jordan Ryan Reuter | 2017-03-07 | 5 | -4/+73 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Kaminari.paginate_array` takes some options, most relevant of which is a `total_count` parameter. Using the `commit_count` for `total_count` lets us correctly treat the return of `Repository#commits` as a subset of all the commits we may wish to list. Addition of a new `Repository#commit_count_for_ref` method was necessarry to allow the user to start from an arbitrary ref. Ref #1381 | ||||
* | | | | Merge branch 'clear-connections-before-starting-sidekiq' into 'master' | Douwe Maan | 2017-03-08 | 2 | -0/+10 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear AR connections before starting Sidekiq Closes gitlab-com/infrastructure#1139 See merge request !9773 | ||||
| * | | | | Clear AR connections before starting Sidekiq | Yorick Peterse | 2017-03-08 | 2 | -0/+10 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | This should ensure that connections obtained before starting Sidekiq are not leaked, leading to connection timeouts. Fixes gitlab-com/infrastructure#1139 | ||||
* | | | | Merge branch 'tc-api-v4-doc-changes' into 'master' | Douwe Maan | 2017-03-08 | 2 | -4/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | API v4 doc changes See merge request !9723 | ||||
| * | | | | API V4 is no longer in Beta | Toon Claes | 2017-03-07 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | And V4 is the preferred version to be used, because V3 will be removed in 9.4 (or later). | ||||
| * | | | | Update description about GET /projects endpoint | Toon Claes | 2017-03-07 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | | | | | It returns all projects visible for the authenticated user, not just the project they are member of. | ||||
* | | | | Merge branch 'tc-api-pipeline-jobs' into 'master' | Douwe Maan | 2017-03-08 | 5 | -34/+229 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | API: Get list of jobs for a pipeline Closes #26843 See merge request !9727 | ||||
| * | | | Remove user_can_download_artifacts | Toon Claes | 2017-03-07 | 2 | -32/+16 |
| | | | | | | | | | | | | | | | | It was actually not used anywhere. | ||||
| * | | | Make it possible to query scope as scope[]= | Toon Claes | 2017-03-07 | 3 | -11/+13 |
| | | | | | | | | | | | | | | | | | | | | Since issues also accepts the query parameter iids[]=, also make it possible query scope like that. | ||||
| * | | | Add GET /projects/:id/pipelines/:pipeline_id/jobs endpoint | Toon Claes | 2017-03-07 | 4 | -1/+210 |
| |/ / | | | | | | | | | | Add endpoint to get the jobs scoped to a pipeline. | ||||
* | | | Merge branch 'orderable-issues' into 'master' | Douwe Maan | 2017-03-08 | 30 | -77/+672 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Allow issues in boards to be ordered Closes #21264 See merge request !8916 | ||||
| * | | Remove unneccessary blank lines | Douwe Maan | 2017-03-07 | 2 | -2/+0 |
| | | | |||||
| * | | Merge branch 'master' into orderable-issues | Douwe Maan | 2017-03-07 | 280 | -1251/+8444 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge branch '18962-update-issues-button-jumps' into 'master' | Alfredo Sumaran | 2017-03-07 | 4 | -5/+36 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Align bulk update issues button to the right Closes #18962 See merge request !8591 | ||||
| * | | | Align bulk update issues button to the right | Rémy Coutable | 2017-03-07 | 4 | -5/+36 |
|/ / / | |||||
* | | | Update CHANGELOG.md for 8.17.3 | Regis | 2017-03-07 | 7 | -24/+9 |
| | | | | | | | | | [ci skip] | ||||
* | | | Merge branch '28230-new-mr-spacing' into 'master' | Annabel Dunstone Gray | 2017-03-07 | 11 | -92/+66 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | consistent padding on new MR panels Closes #28230 See merge request !9568 | ||||
| * | | | consistent spacing on new MR panels28230-new-mr-spacing | Simon Knox | 2017-03-07 | 11 | -92/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | center spinner show placeholder text on new MR page remove redundant `display: block` from li - they default to `list-style` already | ||||
* | | | | Merge branch 'dm-add-concurrent-index-cop' into 'master' | Yorick Peterse | 2017-03-07 | 22 | -22/+192 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add cop to ensure reversibility of add_concurrent_index See merge request !9771 | ||||
| * | | | | Add downtime constantsdm-add-concurrent-index-cop | Douwe Maan | 2017-03-07 | 3 | -0/+6 |
| | | | | | |||||
| * | | | | Add cop to ensure reversibility of add_concurrent_index | Douwe Maan | 2017-03-07 | 22 | -22/+186 |
| | | | | | |||||
* | | | | | Merge branch '27568-refactor-very-slow-dropdown-asignee-spec' into 'master' | Rémy Coutable | 2017-03-07 | 2 | -33/+45 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dropdown_assignee_spec Closes #27568 See merge request !9711 | ||||
| * | | | | | Refactor dropdown_assignee_spec | George Andrinopoulos | 2017-03-07 | 2 | -33/+45 |
|/ / / / / | |||||
* | | | | | Merge branch 'fix-specs-for-access-tokens' into 'master' | Douwe Maan | 2017-03-07 | 2 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix access token specs See merge request !9776 | ||||
| * | | | | | Fix access token specsfix-specs-for-access-tokens | Sean McGivern | 2017-03-07 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de37dcee90ac44ba794ad504e91f18b8fb4b13a3 was a manual merge, which meant it didn't have a build, so I broke master :-( |