summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'clarify-deletion-message' into 'master' Robert Speicher2016-07-301-1/+1
|\
| * Clarify which project is deleted to avoid alarmclarify-deletion-messageStan Hu2016-07-291-1/+1
* | Merge branch 'reject-merge-conflicts' into 'master' Robert Speicher2016-07-301-1/+7
|\ \
| * | Properly abort a merge when merge conflicts occurreject-merge-conflictsStan Hu2016-07-291-1/+7
| |/
* | Improve diff performance by eliminating redundant checks for text blobsremove-redundant-blob-text-callsStan Hu2016-07-293-6/+8
|/
* Merge branch 'ability-batch-issue-checking' into 'master' Robert Speicher2016-07-292-0/+38
|\
| * Method for returning issues readable by a userability-batch-issue-checkingYorick Peterse2016-07-292-0/+38
* | Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher2016-07-296-103/+99
|\ \
| * | Enable Rubocop cops for invalid access modifiersrubocop/enable-access-modifiers-copsGrzegorz Bizon2016-07-191-1/+1
| * | Refactor system notes service to make it singletonGrzegorz Bizon2016-07-191-76/+78
| * | Fix private method visibility in container registryGrzegorz Bizon2016-07-191-6/+6
| * | Fix some useless access modifiers in the codeGrzegorz Bizon2016-07-194-20/+14
* | | Check for Ci::Build artifacts at database levelPaco Guzman2016-07-292-1/+2
* | | Bump gitlab_git to speedup DiffCollection iterationsPaco Guzman2016-07-292-2/+2
* | | Implement final review comments from @rymai.Timothy Andrew2016-07-297-8/+9
* | | Use `Gitlab::Access` to protected branch access levels.Timothy Andrew2016-07-2912-150/+86
* | | 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-291-2/+32
* | | Implement review comments from @axil.Timothy Andrew2016-07-291-14/+12
* | | Implement review comments from @dbalexandre.Timothy Andrew2016-07-297-95/+81
* | | Favor labels like `Allowed to push` over `Allowed To Push`.Timothy Andrew2016-07-293-8/+8
* | | Admins count as masters too.Timothy Andrew2016-07-293-4/+12
* | | Make specs compatible with PhantomJS versions < 2.Timothy Andrew2016-07-291-1/+2
* | | Humanize protected branches' access levels at one location.Timothy Andrew2016-07-295-7/+30
* | | Fix all specs related to changes in !5081.Timothy Andrew2016-07-293-10/+2
* | | Fix default branch protection.Timothy Andrew2016-07-293-5/+7
* | | Update protected branches spec to work with the `select`s.Timothy Andrew2016-07-292-2/+7
* | | 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-292-0/+20
* | | Add "No One Can Push" to the protected branches UI.Timothy Andrew2016-07-298-44/+95
* | | 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
| |/ |/|
* | Merge branch 'cache-commit-author-lookup' into 'master' Yorick Peterse2016-07-291-1/+16
|\ \
| * | Add specs for caching commit authorStan Hu2016-07-271-7/+15
| * | Cache the commit author in RequestStore to avoid extra lookups in PostReceiveStan Hu2016-07-271-1/+8
* | | Merge branch '17073-tagscontroller-index-is-terrible-response-time-goes-up-to...Yorick Peterse2016-07-296-21/+24
|\ \ \
| * | | Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez2016-07-286-21/+24
* | | | Merge branch 'fix/use-fewer-queries-for-mr-notes' into 'master' Douwe Maan2016-07-283-3/+11
|\ \ \ \
| * | | | Reduce number of queries made for merge_requests/:id/diffsfix/use-fewer-queries-for-mr-notesAhmad Sherif2016-07-283-3/+11
* | | | | 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 '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-286-27/+100
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-2817-27/+124
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-2731-76/+213
| |\ \ \ \ \
| * | | | | | Merge some repeated codes to the partialLin Jen-Shin2016-07-272-9/+7
| * | | | | | Fix duplicated issues partial and two cases need the button:Lin Jen-Shin2016-07-261-10/+10
| * | | | | | Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-26481-12908/+16272
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-1518-66/+55
| |\ \ \ \ \ \ \
View Lorry Controller Status