summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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 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
* | | | Merge branch 'use-update-runner-service' into 'master' Kamil Trzciński2017-02-172-6/+6
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-1534-117/+237
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-076-7/+78
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-0427-72/+176
| |\ \ \ \ \ \
| * | | | | | | Prefer service object over after_save hookLin Jen-Shin2017-01-212-6/+6
* | | | | | | | Merge branch '26200-convert-sidebar-to-dropdown' into 'master'Sean McGivern2017-02-172-2/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Drop theme ID from users tableAnnabel Dunstone Gray2017-02-152-2/+0
* | | | | | | | Merge branch 'paginate-environments-bundle' into 'master' Fatih Acet2017-02-161-5/+30
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fe-paginated-environments-api' into 'paginate-environments-bund...paginate-environments-bundleFilipa Lacerda2017-02-161-5/+30
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Add count keys to response JSONfe-paginated-environments-apiZ.J. van de Weg2017-02-151-3/+4
| | * | | | | | | Merge branch 'master' into fe-paginated-environments-apiFilipa Lacerda2017-02-128-25/+14
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add route for environment folder and expose an APIGrzegorz Bizon2017-02-091-0/+18
| | * | | | | | | | Resolve 500 errorFilipa Lacerda2017-02-091-1/+0
| | * | | | | | | | Add support for environment scopes in controllerGrzegorz Bizon2017-02-091-7/+12
| | * | | | | | | | Enable grouping and pagination in environmnets APIGrzegorz Bizon2017-02-091-1/+3
* | | | | | | | | | Merge branch '28176_merge_widget_fix' into 'master' Sean McGivern2017-02-161-3/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix error in MR widget after /merge slash commandJarka Kadlecova2017-02-161-3/+6
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'move_tags_service_to_namespace' into 'master'Rémy Coutable2017-02-151-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Move tag services to `Tags` namespacedixpac2017-02-141-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Execute web hooks for WikiPage delete operationMark Fletcher2017-02-141-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'option-to-be-notified-of-own-activity' into 'master' Douwe Maan2017-02-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Add notified_of_own_activity to permitted attributesRichard Macklin2017-02-011-1/+1
* | | | | | | | Merge branch '27395-reduce-group-activity-sql-queries' into 'master' Yorick Peterse2017-02-131-12/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Use preload for Event#target since it's a polymorphic association27395-reduce-group-activity-sql-queriesRémy Coutable2017-02-131-12/+11
* | | | | | | | | Merge branch '23535-folders-in-wiki-repository' into 'master' Douwe Maan2017-02-131-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into 23535-folders-in-wiki-repositoryAlex Braha Stoll2017-01-2934-288/+404
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Render wiki entries using a collection of WikiPage and WikiDirectory objectsAlex Braha Stoll2016-12-311-2/+2
| * | | | | | | | | Show directory hierarchy when listing wiki pagesAlex Braha Stoll2016-12-311-1/+2
* | | | | | | | | | Merge branch 'issue_25900_2' into 'master' Sean McGivern2017-02-135-4/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-095-4/+38
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'zj-drop-ruby-21-tests' into 'master' Rémy Coutable2017-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update Rubocop to ruby 2.3zj-drop-ruby-21-testsZ.J. van de Weg2017-02-071-1/+1
* | | | | | | | | | | Merge branch 'rename_files_delete_service' into 'master' Rémy Coutable2017-02-131-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Rename Files::DeleteService to Files::DestroyServicedixpac2017-02-101-4/+4
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs-warden-blocked-users' into 'master' Robert Speicher2017-02-106-22/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-usersRobert Speicher2017-02-106-22/+7
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'dz-nested-groups-members-page' into 'master' Dmitriy Zaporozhets2017-02-101-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Show parent group members for nested groupdz-nested-groups-members-pageDmitriy Zaporozhets2017-02-101-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'protected-branch-dropdown-titles' into 'master' Jacob Schatz2017-02-101-2/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |