summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Fix rubocop spec.Timothy Andrew2016-06-031-1/+1
* Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-0343-109/+414
|\
| * Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-021-1/+1
| |\
| | * Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-301-1/+1
| * | Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-012-4/+4
| |\ \
| | * | Split Markdown rendering & reference gatheringYorick Peterse2016-05-262-4/+4
| * | | Merge branch 'rs-remember-me-2fa' into 'master' Douwe Maan2016-06-011-0/+2
| |\ \ \
| | * | | Pass the "Remember me" value to the 2FA token formrs-remember-me-2faRobert Speicher2016-05-301-0/+2
| | | |/ | | |/|
| * | | Merge branch 'issue_15557' into 'master' Rémy Coutable2016-06-012-2/+2
| |\ \ \
| | * | | Add leading comment space copissue_15557Felipe Artur2016-05-312-2/+2
| * | | | Add Application Setting to configure Container Registry token expire delay (d...Kamil Trzcinski2016-05-311-0/+1
| * | | | Merge branch 'patch/wiki_page_events' into 'master' Rémy Coutable2016-05-311-1/+2
| |\ \ \ \
| | * | | | Add Admin UI to enable Wiki Page events webhook in projectsGabriel Mazetto2016-05-301-1/+2
| | | |/ / | | |/| |
| * | | | Merge branch 'make-container-registry-authentication-service-compatible-with-...Stan Hu2016-05-311-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Make authentication service for Container Registry to be compatible with < Do...make-container-registry-authentication-service-compatible-with-older-dockerKamil Trzcinski2016-05-301-1/+1
| * | | | Merge branch 'style/enable-method-def-parentheses-rubocop-cop' into 'master' Robert Speicher2016-05-301-1/+1
| |\ \ \ \
| | * | | | Enable Style/MethodDefParentheses rubocop copstyle/enable-method-def-parentheses-rubocop-copGrzegorz Bizon2016-05-301-1/+1
| | |/ / /
| * | | | Enable Style/EndOfLine Rubocop style copstyle/enable-rubocop-end-of-line-copGrzegorz Bizon2016-05-301-26/+26
| |/ / /
| * | | Project#show on projects pending deletion will 404zj-race-condition-pending-deleteZeger-Jan van de Weg2016-05-281-1/+1
| |/ /
| * | Merge branch 'move-project-dropdown-async' into 'master' Jacob Schatz2016-05-261-0/+18
| |\ \ | | |/ | |/|
| | * Updated Rubymove-project-dropdown-asyncPhil Hughes2016-05-251-2/+5
| | * Correctly sends project IDPhil Hughes2016-05-201-1/+1
| | * Loads move issue dropdown asyncPhil Hughes2016-05-161-0/+15
| * | Merge branch 'updated-contrib-calendar' into 'master' Jacob Schatz2016-05-251-2/+0
| |\ \
| | * | Group the contributing calendar by dayPhil Hughes2016-05-161-2/+0
| | |/
| * | Fixed issue with button color when no CI enabledmerge-button-color-fixPhil Hughes2016-05-251-2/+2
| * | Fix the CI login to Container Registry (the gitlab-ci-token user)Kamil Trzcinski2016-05-231-1/+1
| * | Merge branch 'rm-source-branch' into 'master' Douwe Maan2016-05-201-1/+2
| |\ \
| | * | Allows MR authors to have the source branch removed when merging the MRJeroen Jacobs2016-05-201-1/+2
| * | | Merge branch 'issue_14684_2' into 'master' Douwe Maan2016-05-201-1/+1
| |\ \ \
| | * | | current_user.confirmed_at.present? => current_user.confirmed?issue_14684_2Felipe Artur2016-05-201-1/+1
| | |/ /
| * | | Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master' Douwe Maan2016-05-201-0/+1
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/master' into eReGeBe/gitlab-ce-feature/m...Rémy Coutable2016-05-1846-117/+356
| | |\ \ \
| | * \ \ \ Merge branch 'master' into eReGeBe/gitlab-ce-feature/milestone-mdDouwe Maan2016-04-238-14/+28
| | |\ \ \ \
| | * | | | | Implementing autocomplete for GFM milestone referencesAlejandro Rodríguez2016-04-201-0/+1
| * | | | | | Merge branch 'issue_9013' into 'master' Douwe Maan2016-05-201-7/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Improve documentation and add changelogFelipe Artur2016-05-171-5/+1
| | * | | | | Let users set notification levels in projects which they are not membersFelipe Artur2016-05-171-3/+1
| * | | | | | Merge branch 'feature/runner-config-untagged-jobs' into 'master' Robert Speicher2016-05-192-15/+22
| |\ \ \ \ \ \
| | * | | | | | Minor runner-related code refactoringsGrzegorz Bizon2016-05-191-9/+10
| | * | | | | | Display validation errors when admin edits a runnerGrzegorz Bizon2016-05-191-10/+16
| | * | | | | | Improve displaying validation messages for runnerGrzegorz Bizon2016-05-191-1/+0
| | * | | | | | Add custom validator to runner modelGrzegorz Bizon2016-05-191-1/+2
| * | | | | | | Merge branch 'with-pipeline-view' into 'master' Douwe Maan2016-05-191-0/+59
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Create pipeline objects with parameterswith-pipeline-viewKamil Trzcinski2016-05-181-2/+2
| | * | | | | | Use pipelines.errors when communicating the errorKamil Trzcinski2016-05-181-8/+6
| | * | | | | | Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-169-16/+108
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Improve the pipelines designKamil Trzcinski2016-05-161-1/+1
| | * | | | | | Remove testing delegateKamil Trzcinski2016-05-141-2/+2
| | * | | | | | Fix specsKamil Trzcinski2016-05-141-3/+0