summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'style/enable-semicolon-rubocop-cop' into 'master' Robert Speicher2016-06-011-1/+1
|\
| * Enable Style/Semicolon rubocop style copstyle/enable-semicolon-rubocop-copGrzegorz Bizon2016-06-011-1/+1
* | Merge branch 'rubocop/enable-style-for-cop' into 'master' Robert Speicher2016-06-011-3/+3
|\ \
| * | Enable Style/For rubocop coprubocop/enable-style-for-copGrzegorz Bizon2016-06-011-3/+3
| |/
* | Merge branch 'dz-one-ci-cd-tab' into 'master' Dmitriy Zaporozhets2016-06-014-9/+22
|\ \
| * | Merge Builds and Pipelines tab into onedz-one-ci-cd-tabDmitriy Zaporozhets2016-05-284-9/+22
* | | Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-0133-102/+157
|\ \ \
| * | | Refactor ParticipableYorick Peterse2016-06-018-63/+119
| * | | Refactor MentionableYorick Peterse2016-05-261-10/+9
| * | | Added author to various Markdown calls in viewsYorick Peterse2016-05-2621-24/+24
| * | | Split Markdown rendering & reference gatheringYorick Peterse2016-05-262-4/+4
| * | | Don't modify arguments in CommitRange#initializeYorick Peterse2016-05-261-1/+1
* | | | Merge branch 'fix-cancelable-retryable' into 'master' Douwe Maan2016-06-012-2/+6
|\ \ \ \
| * | | | Pipelines can be canceled only when there are running buildsKamil Trzcinski2016-05-312-2/+6
* | | | | Merge branch 'fix/error-500-in-pipeline-when-fork' into 'master' Rémy Coutable2016-06-011-8/+8
|\ \ \ \ \
| * | | | | User internal pipeline to access project in viewsGrzegorz Bizon2016-06-011-8/+8
| | |_|_|/ | |/| | |
* | | | | Merge branch 'long.polyglot/gitlab-ce-issue_17479_todos_not_remove_when_leave...Douwe Maan2016-06-011-1/+6
|\ \ \ \ \
| * | | | | Add changelog and code refactorLong Nguyen2016-05-301-1/+5
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-30206-1467/+1968
| |\ \ \ \ \
| * | | | | | Fix Member specLong Nguyen2016-05-221-1/+1
| * | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-222-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-211-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-2136-143/+436
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix broken specsLong Nguyen2016-05-211-2/+1
| * | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-211-8/+3
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove todos when destroy project member and specsLong Nguyen2016-05-212-2/+4
| * | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-20131-461/+1540
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-1447-384/+394
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Only show todos of projects that user is a member ofLong Nguyen2016-05-141-1/+1
* | | | | | | | | | | | | Merge branch 'emails-on-push-use-sidekiq-mailers' into 'master' Douwe Maan2016-06-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make EmailsOnPushWorker use Sidekiq mailers queueStan Hu2016-05-311-0/+1
* | | | | | | | | | | | | | Merge branch 'prefer-to_reference' into 'master' Douwe Maan2016-06-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use `Snippet#to_reference` directlyLin Jen-Shin2016-05-311-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rs-remember-me-2fa' into 'master' Douwe Maan2016-06-012-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Pass the "Remember me" value to the 2FA token formrs-remember-me-2faRobert Speicher2016-05-302-0/+3
* | | | | | | | | | | | | | | Merge branch 'current-settings-use-request-store-during-request'Douwe Maan2016-06-011-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Try and use cache for application settings even when the db is not connectedcurrent-settings-use-request-store-during-requestDJ Mountney2016-05-291-0/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'issue_15557' into 'master' Rémy Coutable2016-06-015-6/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add leading comment space copissue_15557Felipe Artur2016-05-314-10/+9
| * | | | | | | | | | | | | | | Fix error 500 when sorting issues by milestone due date and filtering by labelsFelipe Artur2016-05-312-3/+20
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-0116-16/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs-event-common-has-tooltip' into 'master' Dmitriy Zaporozhets2016-06-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add tooltips for common Event feed entriesrs-event-common-has-tooltipRobert Speicher2016-05-301-1/+1
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch '17756-close-btn' into 'master' Jacob Schatz2016-05-312-2/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | New style for close buttons17756-close-btnAnnabel Dunstone2016-05-312-2/+18
| * | | | | | | | | | | | | | Upgrade Kaminari from 0.16.3 to 0.17.0.Connor Shea2016-05-317-9/+9
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'feature/improve_wiki_page_events' into 'master' Rémy Coutable2016-05-312-3/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Codestyle changesGabriel Mazetto2016-05-311-2/+2
| | * | | | | | | | | | | | | Fix hook data for Wiki Page eventGabriel Mazetto2016-05-312-3/+16
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Fix the use of CurrentSettings in ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-311-2/+7