summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-015-8/+16
* Merge branch 'enable-shared-runners-with-admins' into 'master' Rémy Coutable2016-07-012-4/+1
|\
| * Merge remote-tracking branch 'upstream/master' into enable-shared-runners-wit...Lin Jen-Shin2016-07-017-17/+123
| |\
| * | Use Ability to check pre-requisite. Change back to 403 because:Lin Jen-Shin2016-06-291-2/+1
| * | Allow admins to assign locked runners:Lin Jen-Shin2016-06-281-2/+0
| * | Use 409 to indicate that interface might be outdatedLin Jen-Shin2016-06-281-2/+2
| * | Admin should be able to turn shared runners into specific ones:Lin Jen-Shin2016-06-281-1/+1
* | | Merge branch 'avoid-instantiate-tree-for-projects-show-readme-view' into 'mas...Yorick Peterse2016-07-011-1/+6
|\ \ \ | |_|/ |/| |
| * | Avoid instantiation of a Git::Treeavoid-instantiate-tree-for-projects-show-readme-viewPaco Guzman2016-06-291-1/+6
* | | Catch permission denied errors and ignore the diskimprove-system-infoJosh Frye2016-06-301-11/+38
* | | Make GH one-off auth the default again for importing GH projectsRémy Coutable2016-06-301-1/+1
* | | Import from Github using Personal Access Tokens.Eric K Idema2016-06-301-3/+22
* | | Merge branch 'issue-18886' into 'master' Dmitriy Zaporozhets2016-06-301-3/+22
|\ \ \
| * | | Loop all disks when displaying system infoissue-18886Josh Frye2016-06-291-3/+22
* | | | Add Application Setting to configure default Repository Path for new projectsshards-configAlejandro Rodríguez2016-06-291-0/+1
* | | | Merge branch 'rubocop/enable-space-after-cops' into 'master' Robert Speicher2016-06-291-1/+1
|\ \ \ \
| * | | | Enable Style/SpaceAfterColon Rubocop copsGrzegorz Bizon2016-06-291-1/+1
| | |/ / | |/| |
* | | | Merge branch 'master' into issue_3359_3issue_3359_3Felipe Artur2016-06-298-10/+96
|\ \ \ \ | |/ / /
| * | | Merge branch 'zj-workhorse-format-patch' into 'master' Robert Speicher2016-06-291-1/+7
| |\ \ \ | | |/ / | |/| |
| | * | Workhorse to serve email diffsZ.J. van de Weg2016-06-281-1/+7
| * | | Change load average to cpu/cores on system info.Josh Frye2016-06-281-1/+2
| * | | Use number_to_human_size for system info and remove dependency on Filesize gem.Josh Frye2016-06-281-4/+4
| * | | Round figures for system infoJosh Frye2016-06-281-4/+4
| * | | Show basic system info on admin panel. Closes #18886Josh Frye2016-06-281-0/+12
| | |/ | |/|
| * | Merge remote-tracking branch 'dev/master'Robert Speicher2016-06-271-1/+1
| |\ \
| | * \ Merge branch '19102-fix' into 'master' Robert Speicher2016-06-271-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Fix an information disclosure when requesting access to a group containing pr...Rémy Coutable2016-06-241-1/+1
| * | | Fix rendering of commit notesDouwe Maan2016-06-271-1/+8
| |/ /
| * | Merge branch 'issue_19096' into 'master' Stan Hu2016-06-251-0/+7
| |\ \
| | * | Validate presence of essential params for diff renderingissue_19096Ruben Davila2016-06-241-0/+7
| * | | Add specs and improve coffescript sortable binding functionissue_15588Felipe Artur2016-06-241-1/+2
| * | | Fix issue being ordered twice and callback when moving between statesFelipe Artur2016-06-241-1/+1
| * | | Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_mer...19035-fix-merge-issueRémy Coutable2016-06-241-1/+8
| * | | Merge branch 'fix/gitlab-import-project-file-fix' into 'master' Rémy Coutable2016-06-241-1/+5
| |\ \ \
| | * | | fix paramsJames Lopez2016-06-241-2/+2
| | * | | Fix tmp file being deleted after the request plus some cleanup and improved e...James Lopez2016-06-241-1/+5
| | | |/ | | |/|
| * | | Support for rendering/redacting multiple documentsYorick Peterse2016-06-243-3/+39
| |/ /
| * | Merge branch 'zj-pipeline-can-be-nil'Douwe Maan2016-06-231-2/+7
| |\ \ | | |/ | |/|
| | * Check if pipeline is nil before mergingzj-pipeline-can-be-nilZ.J. van de Weg2016-06-231-2/+7
| * | Preload notes/discussions associations (award_emoji: :user)optimize-award-emojiPaco Guzman2016-06-231-2/+2
| |/
* | merge master into issue_3359_3Felipe Artur2016-06-292-12/+10
|\ \
| * | Insert notification settings dropdown into groupsFelipe Artur2016-06-222-14/+39
* | | merge master into issue_3359_3Felipe Artur2016-06-2226-109/+377
|\ \ \ | | |/ | |/|
| * | 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
| | |/ /
View Lorry Controller Status