summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '24814-pipeline-tabs' into 'master' Fatih Acet2016-12-011-1/+9
|\
| * Adds tests for tabs in the rspec for pipelinesFilipa Lacerda2016-11-301-2/+6
| * Pipelines tabsFilipa Lacerda2016-11-301-0/+4
* | Merge branch '18546-update-wiki-page-design' into 'master' Fatih Acet2016-12-011-0/+2
|\ \
| * | use wiki pages index for sidebar overflow and limit sidebar list to 15 pagesMike Greiling2016-11-301-0/+2
| |/
* | Merge branch '25199-fix-broken-urls-in-help-page' into 'master' Sean McGivern2016-12-011-2/+4
|\ \
| * | Fix URL rewritting in the Help section25199-fix-broken-urls-in-help-pageRémy Coutable2016-12-011-2/+4
| |/
* | Replace references to MergeRequestDiff#commits with st_commitsuse-st-commits-where-possibleAdam Niedzielski2016-12-011-2/+2
|/
* Merge branch '25031-do-not-raise-error-in-autocomplete' into 'master' Rémy Coutable2016-11-301-1/+1
|\
| * Do not raise error in AutocompleteController#users when not authorizedSemyon Pupkov2016-11-301-1/+1
* | Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-291-7/+8
|/
* Merge branch '24880-configurable-plaintext-emails' into 'master' Sean McGivern2016-11-291-0/+1
|\
| * Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emailsRuben Davila2016-11-281-0/+1
* | Merge branch 'jej-fix-missing-access-check-on-issues' into 'security'Douwe Maan2016-11-283-9/+3
* | Merge branch 'jej-22869' into 'security'Douwe Maan2016-11-281-12/+8
* | Merge branch '25026-authenticate-user-for-new-snippet' into 'master' Sean McGivern2016-11-281-4/+1
|\ \
| * | Ensure user is authenticated to create a new snippet25026-authenticate-user-for-new-snippetRémy Coutable2016-11-281-4/+1
* | | Prevent error when submitting a merge request and pipeline is not defined24860-actionview-template-error-undefined-method-size-for-nil-nilclassAdam Niedzielski2016-11-281-1/+1
|/ /
* | Merge branch 'fix-dead-help-link' into 'master' Rémy Coutable2016-11-281-3/+3
|\ \
| * | Fix broken external links in help/index.htmlDavid Wagner2016-11-201-3/+3
* | | Merge branch '22253-move-lfshelper-methods-somewhere-else-than-app-helpers' i...Robert Speicher2016-11-286-28/+150
|\ \ \
| * | | Move LfsHelper to a new LfsRequest concern22253-move-lfshelper-methods-somewhere-else-than-app-helpersRémy Coutable2016-11-236-28/+150
* | | | Merge branch 'events-cache-invalidation' into 'master' Douwe Maan2016-11-282-2/+0
|\ \ \ \
| * | | | Remove event caching codeYorick Peterse2016-11-232-2/+0
* | | | | Merge branch 'backport-commands-params' into 'master' Douwe Maan2016-11-241-0/+1
|\ \ \ \ \
| * | | | | Backport Note#commands_changes from EEbackport-commands-paramsDouwe Maan2016-11-241-0/+1
| |/ / / /
* | | | | Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan2016-11-241-0/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add nested groups support to the routingdz-allow-nested-group-routingDmitriy Zaporozhets2016-11-231-0/+8
* | | | | Add a starting date to milestonesmilestone_start_dateValery Sizov2016-11-232-2/+2
| |/ / / |/| | |
* | | | Merge branch '24804-wrong-render-index-should-be-render-show-in-projects-pipe...Kamil Trzciński2016-11-221-1/+1
|\ \ \ \
| * | | | Fix wrong template rendered when CI/CD settings aren't update successfullyRémy Coutable2016-11-221-1/+1
| |/ / /
* | | | Merge branch 'hot-fix-define-pipeline-vars' into 'master' Rémy Coutable2016-11-221-5/+2
|\ \ \ \
| * | | | Do not use MergeRequest#commits in define_pipelines_varshot-fix-define-pipeline-varsAdam Niedzielski2016-11-221-5/+2
| |/ / /
* | | | Merge branch '24576_cant_stop_impersonating' into 'master' Sean McGivern2016-11-221-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Allow admins to stop impersonating users without e-mail addressesOren Kanner2016-11-171-1/+1
* | | | Merge branch '23449-cycle-analytics-2-frontend' into 'master' Jacob Schatz2016-11-221-9/+10
|\ \ \ \
| * | | | Use stage description form endpoint responseAlfredo Sumaran2016-11-211-5/+5
| * | | | Provide stage legend on server responseAlfredo Sumaran2016-11-211-9/+10
* | | | | Merge branch 'hide-empty-merge-request-diffs' into 'master' Sean McGivern2016-11-211-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Hide box with CI status when there are no changes in merge requestAdam Niedzielski2016-11-211-1/+1
| * | | | Return valid response in Projects::MergeRequestsController#ci_status when dif...Adam Niedzielski2016-11-211-1/+1
| * | | | Hide empty merge request diffs when comparing versionsAdam Niedzielski2016-11-211-2/+2
| | |_|/ | |/| |
* | | | Updated code based on feedbackfix/cycle-analytics-no-dataJames Lopez2016-11-211-5/+1
* | | | rename methodJames Lopez2016-11-211-2/+2
* | | | Adds a flag to reflect whether or not there is data in cycle analyticsJames Lopez2016-11-211-5/+19
* | | | Merge branch 'fix/cycle-analytics-permissions' into 'master' Sean McGivern2016-11-211-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | refactored a couple of things based on feedbackfix/cycle-analytics-permissionsJames Lopez2016-11-211-2/+2
| * | | Added permissions per stage to cycle analytics endpointJames Lopez2016-11-211-2/+3
| |/ /
* | | Merge branch 'ee-870-backport' into 'master' Sean McGivern2016-11-214-15/+16
|\ \ \ | |/ / |/| |
| * | Backport some changes done from Time Tracking feature in EE.ee-870-backportRuben Davila2016-11-184-15/+16
View Lorry Controller Status