summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Preload notes/discussions associations (award_emoji: :user)optimize-award-emojiPaco Guzman2016-06-231-2/+2
* Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-exe...Douwe Maan2016-06-224-37/+14
|\
| * Raise a new Gitlab::Access::AccessDeniedError when permission is not enough t...Rémy Coutable2016-06-184-38/+12
| * Redirect to the member's source on request withdrawalRémy Coutable2016-06-181-1/+2
| * Use the new Members::DestroyService in group/project member controllersRémy Coutable2016-06-182-2/+2
| * New Members::DestroyServiceRémy Coutable2016-06-181-2/+4
* | Merge branch 'dz-fix-appearance-preview' into 'master' Jacob Schatz2016-06-211-0/+1
|\ \
| * | Fix admin appearance settings previewdz-fix-appearance-previewDmitriy Zaporozhets2016-06-201-0/+1
| |/
* | Rename commit_data in Pipeline to commitfix/builds-api-nil-commitGrzegorz Bizon2016-06-211-1/+1
* | Merge branch 'feature/runner-lock-on-project' into 'master' Rémy Coutable2016-06-213-11/+11
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-2012-91/+209
| |\ \ | | |/
| * | Rename according to:Lin Jen-Shin2016-06-201-3/+3
| * | Admin::RunnerProjectsController#index is not usedremove-admin-runner-projectsLin Jen-Shin2016-06-171-5/+0
| * | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-1714-55/+195
| |\ \
| * | | Fix typo. It's ivar and the column was called lockedLin Jen-Shin2016-06-161-1/+1
| * | | Fix typo. It's ivar and the column was called lockedLin Jen-Shin2016-06-151-1/+1
| * | | Return the association and check it in controller instead:Lin Jen-Shin2016-06-142-2/+5
| * | | Merge branch 'master' into feature/runner-lock-on-projectLin Jen-Shin2016-06-1411-25/+29
| |\ \ \
| * | | | Avoid enabling locked runners. Give 403 in this caseLin Jen-Shin2016-06-142-0/+3
| * | | | Rename specific_for to available_for:Lin Jen-Shin2016-06-141-1/+1
| * | | | Introduced Ci::Runner.specific_for for getting specific runners:Lin Jen-Shin2016-06-091-2/+1
* | | | | Provide default branch/file path for ProjectsController#show18709-reduce-git-callsPaco Guzman2016-06-201-1/+7
* | | | | Unify check branch name existPaco Guzman2016-06-201-1/+1
* | | | | Fixed issue with returning ref in commits JSONasync-refs-dropdownPhil Hughes2016-06-201-3/+3
* | | | | Fixed Ruby to use excludePhil Hughes2016-06-181-1/+1
* | | | | Correctly adds commit ID into dropdownPhil Hughes2016-06-181-8/+6
* | | | | Pulls back tags if any existPhil Hughes2016-06-181-2/+6
* | | | | Tests fix for ref switcherPhil Hughes2016-06-181-1/+1
* | | | | Refs dropdown is now loaded asyncPhil Hughes2016-06-181-0/+16
| |_|_|/ |/| | |
* | | | Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-174-47/+39
|\ \ \ \
| * \ \ \ Merge master into issue_12758issue_12758Felipe Artur2016-06-176-26/+69
| |\ \ \ \
| * | | | | Allow users to set custom notifications in projects they don't own and severa...Felipe Artur2016-06-171-5/+9
| * | | | | Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-174-52/+37
| |\ \ \ \ \
| | * | | | | Re-use notifications dropdown on user profileFelipe Artur2016-06-164-52/+37
| | * | | | | Refactor custom notifications controller code and add specsFelipe Artur2016-06-141-14/+5
| | * | | | | Remove schema from branch historyFelipe Artur2016-06-131-3/+17
| | | |_|/ / | | |/| | |
| * | | | | Implement custom notification level optionsFelipe Artur2016-06-151-4/+9
* | | | | | Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-181-11/+11
|\ \ \ \ \ \
| * | | | | | Removed todo from JSON responsePhil Hughes2016-06-171-1/+0
| * | | | | | Correctly checks if user is logged in when adding todoPhil Hughes2016-06-171-1/+1
| * | | | | | Improved manual todosPhil Hughes2016-06-171-12/+13
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix-todos-counters' into 'master' Robert Speicher2016-06-171-13/+8
|\ \ \ \ \ \
| * | | | | | Ensure Todos counters doesn't count Todos for projects pending deleteDouglas Barbosa Alexandre2016-06-171-13/+8
* | | | | | | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-141-1/+1
* | | | | | | Cache todo counters (pending/done)18034-cache-todo-counterPaco Guzman2016-06-172-6/+6
* | | | | | | Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master' Rémy Coutable2016-06-171-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Add sorting dropdown to tag page14918-add-filter-dropdown-to-tag-pageAlejandro Rodríguez2016-06-161-2/+4
* | | | | | | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-173-2/+96
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | a few changes based on MR feedbackJames Lopez2016-06-171-6/+12
View Lorry Controller Status