summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix filtered search visual token editing dropdownfix-fs-edit-dropdownClement Ho2017-03-072-3/+21
|
* Add filtered search visual tokensfiltered-search-visual-tokensClement Ho2017-03-0732-376/+2244
|
* Merge branch 'rs-fix-todo-service-spec' into 'master' Douwe Maan2017-03-081-1/+1
|\ | | | | | | | | Fix transient failure in TodoService spec See merge request !9797
| * Fix transient failure in TodoService specRobert Speicher2017-03-071-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 Maan2017-03-0710-172/+564
|\ \ | | | | | | | | | | | | # Conflicts: # doc/api/v3_to_v4.md
| * | Remove unecessary endpoint from repository, add compatibility endpoints for ↵issue_16834Felipe Artur2017-03-078-120/+330
| | | | | | | | | | | | v3 and several improvements
| * | Update API endpoints for raw filesFelipe Artur2017-03-078-145/+328
| | |
* | | Merge branch 'dm-nested-groups-go-get' into 'master' Douwe Maan2017-03-082-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-getDouwe Maan2017-03-072-18/+143
| |/ /
* | | Merge branch '1381-present-commits-pagination-headers-correctly' into 'master' Douwe Maan2017-03-088-13/+195
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | GET "projects/:id/repository/commits" endpoint improvements Closes #1381 and #20207 See merge request !9679
| * | Returns correct header data for commits endpointOswaldo Ferreira2017-03-0710-47/+119
| | |
| * | Fix pagination headers for repository commits api endpointGeorge Andrinopoulos2017-03-074-4/+45
| | |
| * | Manually set total_count when paginating commitsJordan Ryan Reuter2017-03-075-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 Maan2017-03-082-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clear AR connections before starting Sidekiq Closes gitlab-com/infrastructure#1139 See merge request !9773
| * | | Clear AR connections before starting SidekiqYorick Peterse2017-03-082-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 Maan2017-03-082-4/+6
|\ \ \ | | | | | | | | | | | | | | | | API v4 doc changes See merge request !9723
| * | | API V4 is no longer in BetaToon Claes2017-03-071-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 endpointToon Claes2017-03-071-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 Maan2017-03-085-34/+229
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | API: Get list of jobs for a pipeline Closes #26843 See merge request !9727
| * | Remove user_can_download_artifactsToon Claes2017-03-072-32/+16
| | | | | | | | | | | | It was actually not used anywhere.
| * | Make it possible to query scope as scope[]=Toon Claes2017-03-073-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 endpointToon Claes2017-03-074-1/+210
| |/ | | | | | | Add endpoint to get the jobs scoped to a pipeline.
* | Merge branch 'orderable-issues' into 'master' Douwe Maan2017-03-0830-77/+672
|\ \ | |/ |/| | | | | | | | | Allow issues in boards to be ordered Closes #21264 See merge request !8916
| * Remove unneccessary blank linesDouwe Maan2017-03-072-2/+0
| |
| * Merge branch 'master' into orderable-issuesDouwe Maan2017-03-07280-1251/+8444
| |\ | |/ |/|
* | Merge branch '18962-update-issues-button-jumps' into 'master' Alfredo Sumaran2017-03-074-5/+36
|\ \ | | | | | | | | | | | | | | | | | | Align bulk update issues button to the right Closes #18962 See merge request !8591
| * | Align bulk update issues button to the rightRémy Coutable2017-03-074-5/+36
|/ /
* | Update CHANGELOG.md for 8.17.3Regis2017-03-077-24/+9
| | | | | | [ci skip]
* | Merge branch '28230-new-mr-spacing' into 'master' Annabel Dunstone Gray2017-03-0711-92/+66
|\ \ | | | | | | | | | | | | | | | | | | consistent padding on new MR panels Closes #28230 See merge request !9568
| * | consistent spacing on new MR panels28230-new-mr-spacingSimon Knox2017-03-0711-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 Peterse2017-03-0722-22/+192
|\ \ \ | | | | | | | | | | | | | | | | Add cop to ensure reversibility of add_concurrent_index See merge request !9771
| * | | Add downtime constantsdm-add-concurrent-index-copDouwe Maan2017-03-073-0/+6
| | | |
| * | | Add cop to ensure reversibility of add_concurrent_indexDouwe Maan2017-03-0722-22/+186
| | | |
* | | | Merge branch '27568-refactor-very-slow-dropdown-asignee-spec' into 'master' Rémy Coutable2017-03-072-33/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dropdown_assignee_spec Closes #27568 See merge request !9711
| * | | | Refactor dropdown_assignee_specGeorge Andrinopoulos2017-03-072-33/+45
|/ / / /
* | | | Merge branch 'fix-specs-for-access-tokens' into 'master' Douwe Maan2017-03-072-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix access token specs See merge request !9776
| * | | | Fix access token specsfix-specs-for-access-tokensSean McGivern2017-03-072-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | de37dcee90ac44ba794ad504e91f18b8fb4b13a3 was a manual merge, which meant it didn't have a build, so I broke master :-(
* | | | | Merge branch 'zj-variables-build-job' into 'master' Kamil Trzciński2017-03-075-50/+114
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename BUILD to JOB in CI Variables Closes #29053 See merge request !9756
| * | | | | Rename REF to SHAZ.J. van de Weg2017-03-073-4/+4
| | | | | |
| * | | | | Rename BUILD to JOB in CI Variableszj-variables-build-jobZ.J. van de Weg2017-03-075-50/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given GitLab moves away from using the term build, everywhere, also the CI variables are being renamed. For now, both `CI_BUILD_X` and `CI_JOB_X` are supported, with the same values. However, in about 3 months, support will be dropped.
* | | | | | Merge branch '29005-rspec-profiling-errors-to-warnings' into 'master' Robert Speicher2017-03-071-9/+28
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swallow collection errors in RspecProfiling Closes #29005 See merge request !9765
| * | | | | Swallow collection errors in RspecProfilingNick Thomas2017-03-071-9/+28
| | |/ / / | |/| | |
* | | | | Merge branch 'zj-chat-teams-unique' into 'master' Kamil Trzciński2017-03-073-0/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Namespace can have only one chat team See merge request !9769
| * | | | | Namespace can have only one chat teamzj-chat-teams-uniqueZ.J. van de Weg2017-03-073-0/+15
| | |/ / / | |/| | |
* | | | | Merge branch 'priority-to-label-priority' into 'master' Sean McGivern2017-03-074-7/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rename priority sorting option to label priority See merge request !9746
| * | | | | Rename priority sorting option to label priorityDimitrie Hoekstra2017-03-074-7/+11
|/ / / / /
* | | | | Merge branch ↵Sean McGivern2017-03-0727-114/+328
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages' into 'master' Resolve "Combine Deploy Keys and Push Rules and Mirror Repository and Protect Branches settings pages" Closes #26732 See merge request !8731
| * \ \ \ \ Merge branch 'master' into ↵26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pagesPhil Hughes2017-03-072089-22418/+16234
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages
| * | | | | | Added test case for the avaiable project keysJose Ivan Vargas2017-03-061-4/+11
| | | | | | |
| * | | | | | Renamed the redirect_request concern to repository_settings_redirectJose Ivan Vargas2017-03-064-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed naming of a test in the deploy_keys_presenter
View Lorry Controller Status