summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use foreach instead of map as per code reviewenvironments-realtimeFilipa Lacerda2017-07-051-1/+1
* Update method to allow to update several props in order to reuse in eeFilipa Lacerda2017-07-052-11/+9
* Adds testsFilipa Lacerda2017-07-052-1/+21
* Merge the old state with the new for a better realtime experience. Fix loadin...Filipa Lacerda2017-07-044-26/+19
* Merge branch '33410-unicorn_metrics' into 'master'Rémy Coutable2017-07-0414-47/+425
|\
| * Instrument Unicorn with Ruby exporterPaweł Chojnacki2017-07-0414-47/+425
|/
* Merge branch 'docs/extended-docker-syntax-in-ci-yml' into 'master'Achilleas Pipinellis2017-07-041-63/+259
|\
| * Refactor and copyedit "Using Docker images" docsdocs/extended-docker-syntax-in-ci-ymlAchilleas Pipinellis2017-07-031-135/+150
| * Update syntax description to new syntax introduced in !12536.Tomasz Maczukin2017-07-031-10/+15
| * Add documentation for extended docker configuration options for CITomasz Maczukin2017-07-031-0/+176
* | Merge branch '33130-remove-group-modal' into 'master'Rémy Coutable2017-07-044-9/+27
|\ \
| * | Remove group modal like remove project modal. Closes #33130Diego Souza2017-07-044-9/+27
|/ /
* | Merge branch 'mk-workaround-intermittent-failure' into 'master'Douwe Maan2017-07-041-14/+24
|\ \
| * | Reduce 28 test runs to 4mk-workaround-intermittent-failureMichael Kozono2017-06-301-16/+20
| * | Rspec/AroundBlock doesn’t know about rspec-retryMichael Kozono2017-06-291-1/+1
| * | Increase CI retries to 4 for these examplesMichael Kozono2017-06-291-0/+6
* | | Merge branch 'zj-i18n-pipeline-charts' into 'master'Douwe Maan2017-07-046-26/+166
|\ \ \
| * | | Strings ready for translation; Pipeline chartszj-i18n-pipeline-chartsZ.J. van de Weg2017-07-036-26/+166
* | | | Merge branch 'tc-namespace-license-checks--multiple-assignees' into 'master'Douwe Maan2017-07-0413-49/+145
|\ \ \ \
| * | | | Ensure /reassign does not assign multiple usersToon Claes2017-06-201-5/+14
| * | | | Make MergeRequest respond to assignee_ids & assignee_ids=Toon Claes2017-06-205-32/+47
| * | | | Backport /reassign quick commandToon Claes2017-06-202-1/+35
| * | | | Backport issuable for assignee slash commands from EEToon Claes2017-06-202-8/+42
| * | | | Use helper method to set filtered search input attributesToon Claes2017-06-202-1/+13
| * | | | Use FormHelper#issue_assignees_dropdown_options for Issue sidebarToon Claes2017-06-202-6/+8
| * | | | [noop] Remove unused codeToon Claes2017-06-201-2/+0
| * | | | FormHelper#issue_assignees_dropdown_options never has multiple assigneesToon Claes2017-06-203-15/+7
* | | | | Merge branch '34141-allow-unauthenticated-access-to-the-users-api' into 'master'Rémy Coutable2017-07-048-22/+129
|\ \ \ \ \
| * | | | | Simplify authentication logic in the v4 users API for !12445.Timothy Andrew2017-07-043-10/+25
| * | | | | Implement review comments for !12445 from @jneen.34141-allow-unauthenticated-access-to-the-users-apiTimothy Andrew2017-07-032-1/+34
| * | | | | Merge remote-tracking branch 'origin/master' into 34141-allow-unauthenticated...Timothy Andrew2017-06-30844-7962/+20533
| |\ \ \ \ \
| * | | | | | Implement review comments for !12445 from @godfat and @rymai.Timothy Andrew2017-06-307-32/+26
| * | | | | | Add CHANGELOG entry for CE MR 12445Timothy Andrew2017-06-261-0/+4
| * | | | | | Allow unauthenticated access to the `/api/v4/users` API.Timothy Andrew2017-06-264-10/+61
* | | | | | | Merge branch '34647-fix-move_spec' into 'master'Sean McGivern2017-07-041-4/+1
|\ \ \ \ \ \ \
| * | | | | | | wait_for_requests is not needed when AJAX is not in playRémy Coutable2017-07-041-4/+1
* | | | | | | | Merge branch 'fix-pending-delete-forks' into 'master'Sean McGivern2017-07-042-29/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't resolve fork relationships for projects pending deleteNick Thomas2017-07-042-2/+18
| * | | | | | | | Clean up the ForkedProjectLink specsNick Thomas2017-07-041-29/+35
* | | | | | | | | Merge branch 'gitaly-clean-up-tests' into 'master'Sean McGivern2017-07-048-144/+95
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Remove unnecessary clear_stubs callsJacob Vosmaer2017-07-042-12/+0
| * | | | | | | | Add test for GitalyClient::Ref#find_ref_nameJacob Vosmaer2017-07-042-1/+10
| * | | | | | | | Add a UTF-8 encoding matcherJacob Vosmaer2017-06-305-8/+19
| * | | | | | | | Remove unnecessary contextsJacob Vosmaer2017-06-303-131/+74
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'tc-no-delete-protected-merged-branches' into 'master'Rémy Coutable2017-07-043-0/+14
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | DeleteMergedBranchesService should not delete protected branchesToon Claes2017-07-043-0/+14
* | | | | | | | Merge branch 'sh-optimize-project-commit-api' into 'master'Rémy Coutable2017-07-042-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Optimize creation of commit API by using Repository#commit instead of Reposit...sh-optimize-project-commit-apiStan Hu2017-07-032-1/+5
* | | | | | | | | Merge branch 'hb-hide-archived-labels-from-group-issue-tracker' into 'master'Sean McGivern2017-07-043-4/+13
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Hide archived project labels from group issue trackerHoracio Bertorello2017-06-303-4/+13
View Lorry Controller Status