summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use Grape DSL to document methods and their paramsrc-use-grape-dsl-to-document-members-apiRémy Coutable2016-10-053-97/+79
* Merge branch 'all-skipped-equals-success' into 'master' Rémy Coutable2016-10-058-74/+179
|\
| * Merge remote-tracking branch 'upstream/master' into all-skipped-equals-successall-skipped-equals-successLin Jen-Shin2016-10-055-6/+19
| |\
| * | Introduce all_state_names so that we could avoid NOT INLin Jen-Shin2016-10-052-2/+6
| * | Merge remote-tracking branch 'upstream/master' into all-skipped-equals-successLin Jen-Shin2016-10-0485-369/+784
| |\ \
| * | | Add an entry in CHANGELOG [ci skip]Lin Jen-Shin2016-10-041-0/+1
| * | | HasStatus.status is now already aware of thatLin Jen-Shin2016-10-031-2/+1
| * | | We don't need self. there. (sorry, can't resist anymore)Lin Jen-Shin2016-10-031-1/+1
| * | | Merge branch 'master' into all-skipped-equals-successLin Jen-Shin2016-10-03170-868/+2535
| |\ \ \
| * | | | Fix tests. Check 'success' first (default status)Lin Jen-Shin2016-10-032-24/+21
| * | | | Add test for CommitStatus.exclude_ignoredLin Jen-Shin2016-10-032-16/+40
| * | | | Remove dead codeLin Jen-Shin2016-10-031-2/+0
| * | | | Style/EmptyLinesAroundBlockBodyLin Jen-Shin2016-10-031-0/+3
| * | | | Specify 3 cases we want them to be excluded. [ci skip]Lin Jen-Shin2016-10-031-0/+1
| * | | | Rename ignored to failed_but_allowed, introduce exclude_ignoredLin Jen-Shin2016-10-035-22/+29
| * | | | Add a test for on_failure jobs in the middleLin Jen-Shin2016-10-012-1/+19
| * | | | on_failure should also be ignored, and status_sql shouldLin Jen-Shin2016-10-012-8/+10
| * | | | Should use eq because we want ordersLin Jen-Shin2016-10-011-6/+3
| * | | | Or we could simply ignore skipped manual jobsLin Jen-Shin2016-09-302-2/+7
| * | | | We consider skipped = success, fixes #22598Lin Jen-Shin2016-09-302-1/+50
| * | | | Less confusing nameLin Jen-Shin2016-09-301-19/+19
* | | | | Merge branch 'doc/using_docker_images' into 'master' Sean McGivern2016-10-051-1/+1
|\ \ \ \ \
| * | | | | Fix small typo in using_docker_images.md, file is called `build_script` (usin...Sander Dalemans2016-10-031-1/+1
* | | | | | Merge branch 'remove-reset-project-activity-lease' into 'master' Rémy Coutable2016-10-054-20/+12
|\ \ \ \ \ \
| * | | | | | Remove lease from Event#reset_project_activityremove-reset-project-activity-leaseYorick Peterse2016-10-044-20/+12
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'doc-admin-housekeeping' into 'master' Rémy Coutable2016-10-052-1/+1
|\ \ \ \ \ \
| * | | | | | Update housekeeping docs for new GitLab UI.Wolfgang Faust2016-10-042-1/+1
* | | | | | | Merge branch 'sh-fix-project-deletion-private-visibility' into 'master' Rémy Coutable2016-10-053-2/+27
|\ \ \ \ \ \ \
| * | | | | | | Fix project deletion when feature visibility is set to privatesh-fix-project-deletion-private-visibilityStan Hu2016-10-043-2/+27
|/ / / / / / /
* | | | | | | Merge branch 'fix-todo-mobile-view' into 'master' Annabel Dunstone Gray2016-10-042-0/+20
|\ \ \ \ \ \ \
| * | | | | | | Fix todos page mobile viewport layoutClement Ho2016-10-032-0/+20
| |/ / / / / /
* | | | | | | Fix section name for 8.12.2 version.Ruben Davila2016-10-041-1/+1
* | | | | | | Merge branch 'fix/22225' into 'master' Sean McGivern2016-10-045-16/+55
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Update CHANGELOGfix/22225Douglas Barbosa Alexandre2016-10-041-1/+2
| * | | | | | Skip wiki creation when GitHub project has wiki enabledDouglas Barbosa Alexandre2016-10-044-16/+54
* | | | | | | Merge branch 'code-blocks-vue-pre' into 'master' Jacob Schatz2016-10-045-6/+19
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fixed banzai test failuresPhil Hughes2016-10-041-4/+4
| * | | | | | Removed puts code :see_no_evil:code-blocks-vue-prePhil Hughes2016-10-041-1/+0
| * | | | | | Adds v-pre to code blocks in commentsPhil Hughes2016-10-044-3/+17
* | | | | | | Merge branch 'rs-update-rubocop' into 'master' Rémy Coutable2016-10-044-55/+128
|\ \ \ \ \ \ \
| * | | | | | | Update RuboCop to 0.43.0 and update configurationrs-update-rubocopRobert Speicher2016-10-044-55/+128
* | | | | | | | Merge branch 'restrict-failed-2fa-attempts' into 'master' Rémy Coutable2016-10-044-3/+69
|\ \ \ \ \ \ \ \
| * | | | | | | | Restrict failed login attempts for users with 2FASean McGivern2016-10-044-3/+69
* | | | | | | | | Merge branch 'zj-save-environment-deployment-refs' into 'master' Kamil Trzciński2016-10-046-3/+41
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | deployment refs in own folder, new method for creating refszj-save-environment-deployment-refsZ.J. van de Weg2016-10-045-4/+18
| * | | | | | | | Update method nameZeger-Jan van de Weg2016-10-041-1/+1
| * | | | | | | | Save a fetchable ref per deployementZ.J. van de Weg2016-10-044-2/+26
* | | | | | | | | Merge branch '22343-honor-user-fixed-layout-pref' into 'master' Fatih Acet2016-10-0411-33/+58
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | fix diff_view cookie path within merge conflict page22343-honor-user-fixed-layout-prefMike Greiling2016-09-201-1/+3
| * | | | | | | | ensure the 'fixed layout' preference is honored whenever possibleMike Greiling2016-09-2011-32/+55
View Lorry Controller Status