summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mock-ci-service' into 'master'Douwe Maan2017-02-271-0/+1
|\
| * Add MockCiService integrationmock-ci-serviceEric Eastwood2017-02-241-0/+1
* | Merge branch 'issue_24815' into 'master' Sean McGivern2017-02-273-14/+29
|\ \ | |/ |/|
| * Fix issuable stale object error handler for js when updating tasklistsissue_24815Felipe Artur2017-02-243-14/+29
* | Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-2426-120/+181
|\ \
| * \ Merge branch 'create_branch_repo_less' into 'master' Robert Speicher2017-02-231-4/+26
| |\ \
| | * | Fixes after reviewcreate_branch_repo_lessValery Sizov2017-02-231-5/+15
| | * | Create master branch first if project is repository-lessValery Sizov2017-02-231-4/+16
| * | | Fix new offensesdm-meer-blauw-op-straatDouwe Maan2017-02-231-4/+4
| * | | Revert "Enable Style/DotPosition"Douwe Maan2017-02-2313-65/+65
| * | | Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-2331-120/+120
| * | | Fix new offensesDouwe Maan2017-02-231-1/+1
| * | | Enable Style/MultilineHashBraceLayoutDouwe Maan2017-02-232-3/+6
| * | | Prefer leading style for Style/DotPositionDouwe Maan2017-02-2331-122/+122
| * | | Fix code for copsDouwe Maan2017-02-234-25/+29
| * | | Enable Style/ConditionalAssignmentDouwe Maan2017-02-234-12/+12
| * | | Enable Style/ColonMethodCallDouwe Maan2017-02-231-1/+1
| * | | Enable Performance/RedundantBlockCallDouwe Maan2017-02-231-1/+1
| * | | Enable Style/MutableConstantDouwe Maan2017-02-233-5/+5
| * | | Enable Style/DotPositionDouwe Maan2017-02-2313-69/+69
| * | | Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabsFilipa Lacerda2017-02-2326-124/+154
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'add_mr_info_to_issues_list' into 'master'Sean McGivern2017-02-225-10/+18
| | |\ \ | | | |/ | | |/|
| | | * Refactored count_for_collection() for using pluck instead of selectblackst0ne2017-02-211-2/+2
| | | * Merge remote-tracking branch 'upstream/master' into add_mr_info_to_issues_listblackst0ne2017-02-2114-46/+52
| | | |\
| | | * | Added second parameter to @issuable_meta_data variablesblackst0ne2017-02-172-2/+2
| | | * | Add merge request count to each issue on issues listblackst0ne2017-02-173-8/+16
| | * | | Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master'Sean McGivern2017-02-224-49/+49
| | |\ \ \
| | | * | | Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-editOswaldo Ferreira2017-02-214-49/+49
| | | | |/ | | | |/|
| | * | | fixes delimiter removes when todo marked as doneNur Rony2017-02-221-2/+4
| | * | | Merge branch 'add-filtered-search-to-mr' into 'master' Alfredo Sumaran2017-02-221-0/+11
| | |\ \ \
| | | * | | Add filtered search to MR pageadd-filtered-search-to-mrClement Ho2017-02-211-0/+11
| | | |/ /
| | * | | Merge branch 'dm-no-more-andor' into 'master'Robert Speicher2017-02-229-17/+15
| | |\ \ \
| | | * | | No more and/orDouwe Maan2017-02-219-17/+15
| | | |/ /
| | * | | change todos counter position & format ( for large counts )mhasbini2017-02-211-0/+5
| | |/ /
| * | | Adds Pending and Finished tabs to pipelines pageFilipa Lacerda2017-02-161-2/+10
| | |/ | |/|
* | | Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-212-12/+11
|\ \ \ | | |/ | |/|
| * | Merge branch 'dm-fix-editing-files-on-forks-quick' into 'master' Robert Speicher2017-02-201-12/+4
| |\ \
| | * | Fix issue where files on a fork could not be editedDouwe Maan2017-02-171-12/+4
| * | | Merge branch 'authentiq-backchannel-logout' into 'master' Douwe Maan2017-02-201-0/+7
| |\ \ \
| | * | | Added support for Authentiq Back-Channel LogoutAlexandros Keramidas2017-02-201-0/+7
| | | |/ | | |/|
* | | | Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-2113-42/+77
|\ \ \ \ | |/ / /
| * | | Merge branch '21240_snippets_line_ending' into 'master' Sean McGivern2017-02-203-25/+24
| |\ \ \
| | * | | Download snippets with LF line-endings by defaultJarka Kadlecova2017-02-203-25/+24
| * | | | Merge branch 'fix_sidekiq_concurrency_warning_message_in_admin_background_job...Rémy Coutable2017-02-201-0/+1
| |\ \ \ \
| | * | | | fix incorrect sidekiq concurrency count in admin background pagewendy04022017-02-191-0/+1
| * | | | | exclude rpc_pipefs from system disc infoBen Bodenmiller2017-02-181-0/+1
| |/ / / /
| * | | | Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' Clement Ho2017-02-181-0/+6
| |\ \ \ \
| | * | | | Todo done clicking is kind of unusable.Jacopo2017-02-171-0/+6
| | | |/ / | | |/| |
| * | | | Merge branch '27920-both-wip-messages-showing' into 'master' Fatih Acet2017-02-172-1/+3
| |\ \ \ \
| | * | | | Dispatch needed JS when creating a new MR in diff view27920-both-wip-messages-showingSam Rose2017-02-142-1/+3
View Lorry Controller Status