summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Minor fixes in the Env API endpointszj-env-external-urlZ.J. van de Weg2016-08-013-4/+24
* Use Grape DSL for environment endpointsZ.J. van de Weg2016-07-296-97/+108
* Incorporate feedbackZ.J. van de Weg2016-07-298-29/+45
* Add API support for environmentsZ.J. van de Weg2016-07-295-0/+313
* Add an URL field to EnvironmentsZ.J. van de Weg2016-07-2914-28/+133
* Merge branch '18193-no-one-can-push' into 'master' Rémy Coutable2016-07-2935-184/+627
|\
| * Implement final review comments from @rymai.Timothy Andrew2016-07-2914-11/+55
| * Use `Gitlab::Access` to protected branch access levels.Timothy Andrew2016-07-2920-188/+152
| * Fix `git_push_service_spec`Timothy Andrew2016-07-291-1/+2
| * Authorize user before creating/updating a protected branch.Timothy Andrew2016-07-293-5/+15
| * Have the `branches` API work with the new protected branches data model.Timothy Andrew2016-07-294-17/+54
| * Implement review comments from @axil.Timothy Andrew2016-07-292-16/+16
| * Remove duplicate specs from `git_access_spec`Timothy Andrew2016-07-291-9/+7
| * Implement review comments from @dbalexandre.Timothy Andrew2016-07-2914-152/+81
| * Favor labels like `Allowed to push` over `Allowed To Push`.Timothy Andrew2016-07-293-8/+8
| * Add changelog entry.Timothy Andrew2016-07-291-0/+3
| * Admins count as masters too.Timothy Andrew2016-07-294-10/+36
| * Make specs compatible with PhantomJS versions < 2.Timothy Andrew2016-07-292-5/+2
| * Humanize protected branches' access levels at one location.Timothy Andrew2016-07-296-16/+32
| * Fix all specs related to changes in !5081.Timothy Andrew2016-07-296-52/+4
| * Fix default branch protection.Timothy Andrew2016-07-294-10/+19
| * Update protected branches spec to work with the `select`s.Timothy Andrew2016-07-293-2/+82
| * Allow setting "Allowed To Push/Merge" while creating a protected branch.Timothy Andrew2016-07-296-37/+58
| * Enforce "No One Can Push" during git operations.Timothy Andrew2016-07-296-40/+89
| * Add "No One Can Push" to the protected branches UI.Timothy Andrew2016-07-298-44/+95
| * Add seeds for protected branches.Timothy Andrew2016-07-291-0/+12
| * Use the `{Push,Merge}AccessLevel` models in the UI.Timothy Andrew2016-07-297-9/+88
| * Add models for the protected branch access levels.Timothy Andrew2016-07-293-0/+9
| * Add a series of migrations changing the model-level design of protected branc...Timothy Andrew2016-07-297-4/+160
|/
* Merge branch 'cache-commit-author-lookup' into 'master' Yorick Peterse2016-07-293-1/+37
|\
| * Add specs for caching commit authorStan Hu2016-07-272-7/+35
| * Cache the commit author in RequestStore to avoid extra lookups in PostReceiveStan Hu2016-07-272-1/+9
* | Merge branch '17073-tagscontroller-index-is-terrible-response-time-goes-up-to...Yorick Peterse2016-07-2912-55/+72
|\ \
| * | Fix failing CommitController spec17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-secondsAlejandro Rodríguez2016-07-281-9/+0
| * | Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez2016-07-2811-46/+72
* | | Merge branch 'fix/use-fewer-queries-for-mr-notes' into 'master' Douwe Maan2016-07-284-3/+12
|\ \ \
| * | | Reduce number of queries made for merge_requests/:id/diffsfix/use-fewer-queries-for-mr-notesAhmad Sherif2016-07-284-3/+12
* | | | Merge branch 'ci-icons-again' into 'master' Jacob Schatz2016-07-286-67/+24
|\ \ \ \
| * | | | Replace ci icons with slightly thicker onesci-icons-againAnnabel Dunstone2016-07-266-67/+24
* | | | | Merge branch 'remove-unpullable-project' into 'master' Robert Speicher2016-07-281-1/+0
|\ \ \ \ \
| * | | | | Remove project which can't be pulled while seedingZ.J. van de Weg2016-07-281-1/+0
* | | | | | Merge branch 'log-project-deletion' into 'master' Stan Hu2016-07-281-1/+4
|\ \ \ \ \ \
| * | | | | | Add a log message when a project is scheduled for destruction for debuggingStan Hu2016-07-281-1/+4
| |/ / / / /
* | | | | | Merge branch 'new-issue-by-email' into 'master' Douwe Maan2016-07-2825-264/+686
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-2845-270/+707
| |\ \ \ \ \ | | |/ / / /
| * | | | | Remove extra entries from auto-merge accidentLin Jen-Shin2016-07-281-2/+0
| * | | | | Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-2774-217/+721
| |\ \ \ \ \
| * | | | | | Test both for having existing issues or notLin Jen-Shin2016-07-271-2/+12
| * | | | | | Merge some repeated codes to the partialLin Jen-Shin2016-07-272-9/+7
| * | | | | | Add CHANGELOG entry for creating new issues from emailLin Jen-Shin2016-07-271-0/+1
View Lorry Controller Status