summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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 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
| |_|_|/ |/| | |
View Lorry Controller Status