summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix StrongAttibutes error with Ruby 2.124730-broken-masterRémy Coutable2016-11-211-4/+5
* Merge branch 'fix/cycle-analytics-permissions' into 'master' Sean McGivern2016-11-215-1/+183
|\
| * refactored a couple of things based on feedbackfix/cycle-analytics-permissionsJames Lopez2016-11-2110-25/+19
| * fix spec failureJames Lopez2016-11-211-1/+1
| * Added permissions per stage to cycle analytics endpointJames Lopez2016-11-2113-11/+199
* | Merge branch '24552-js-environment-timeago-is-not-rendered-and-text-shows-obj...Fatih Acet2016-11-212-2/+54
|\ \
| * | Fix timeago rendering for environment timeago24552-js-environment-timeago-is-not-rendered-and-text-shows-object-object-in-mr-widgetClement Ho2016-11-192-2/+54
* | | Merge branch '24616-mr-shows-the-build-for-this-merge-request-failed-although...Kamil Trzciński2016-11-217-12/+61
|\ \ \
| * | | Fix a wrong "The build for this merge request failed" message24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-runningRémy Coutable2016-11-217-12/+61
* | | | Merge branch 'fix/do-not-add-todo-when-build-allowed-to-fail' into 'master' 24710-external-statuses-pipelineKamil Trzciński2016-11-215-9/+47
|\ \ \ \
| * | | | Add documentation about todos and failed buildsGrzegorz Bizon2016-11-211-2/+4
| * | | | Add Changelog entry for failed builds todos fixGrzegorz Bizon2016-11-211-0/+4
| * | | | Do not create TODO when build is allowed to failGrzegorz Bizon2016-11-213-7/+39
* | | | | Merge branch 'ee-870-backport' into 'master' Sean McGivern2016-11-2113-17/+85
|\ \ \ \ \
| * | | | | Backport some changes done from Time Tracking feature in EE.ee-870-backportRuben Davila2016-11-1813-17/+85
* | | | | | Merge branch 'grapify-users-api' into 'master' Rémy Coutable2016-11-213-306/+320
|\ \ \ \ \ \
| * | | | | | Grapify the users APIgrapify-users-apiRobert Schilling2016-11-213-307/+321
* | | | | | | Merge branch 'make-prepare-build-sh-compat' into 'master' Rémy Coutable2016-11-211-4/+5
|\ \ \ \ \ \ \
| * | | | | | | Remove bashism from scripts/prepare_build.shNick Thomas2016-11-181-4/+5
* | | | | | | | Merge branch 'dz-fix-group-name-dot' into 'master' Rémy Coutable2016-11-213-8/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix 404 on some group pages when name contains dotdz-fix-group-name-dotDmitriy Zaporozhets2016-11-213-8/+25
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'create-pipeline-endpoint' into 'master' Rémy Coutable2016-11-214-0/+117
|\ \ \ \ \ \ \ \
| * | | | | | | | Add api endpoint for creating a pipelineIdo Leibovich2016-11-184-0/+117
* | | | | | | | | Merge branch 'issue_5541' into 'master' Sean McGivern2016-11-2111-32/+92
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Allow enabling and disabling commit and MR events for JIRAissue_5541Felipe Artur2016-11-1811-32/+92
* | | | | | | | | Merge branch 'remove-unnecessary-self-from-user-model' into 'master' Rémy Coutable2016-11-212-54/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unnecessary self from user modelSemyon Pupkov2016-11-192-54/+57
* | | | | | | | | | Merge branch 'use-build-in-broadcast-message-spec' into 'master' Rémy Coutable2016-11-211-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Use build instead create in BroadcastMessage model specSemyon Pupkov2016-11-191-1/+1
* | | | | | | | | | Merge branch '24627-fix-bad-mr-error-message' into 'master' Rémy Coutable2016-11-213-2/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix regression in Merge request formAlex Sanford2016-11-193-2/+13
* | | | | | | | | | Merge branch 'super-secret-login-upgrade' into 'master' Fatih Acet2016-11-192-25/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Un-un-revert signin tab order fix.super-secret-login-upgradeBryce Johnson2016-11-182-25/+2
* | | | | | | | | | | Merge branch 'fix-db-schema' into 'master' Kamil Trzciński2016-11-191-3/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove duplicate sidekiq throttling parametersfix-db-schemaKamil Trzcinski2016-11-191-3/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'fix-typo-in-gitlab-flow' into 'master' Achilleas Pipinellis2016-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix typo in gitlab_flow.md ('munch'->'much')kkkkkkkk2016-11-191-1/+1
* | | | | | | | | | | | Merge branch 'patch-7' into 'master' Achilleas Pipinellis2016-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Fix wrong linkebuildy2016-11-191-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '24673-broken-test-in-merge_request_widget_spec-js' into 'master' Jacob Schatz2016-11-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix spec24673-broken-test-in-merge_request_widget_spec-jsClement Ho2016-11-181-2/+2
* | | | | | | | | | | | Merge branch '22539-display-folders' into 'master' Fatih Acet2016-11-1943-329/+2349
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix test22539-display-foldersFilipa Lacerda2016-11-191-22/+11
| * | | | | | | | | | | Fix broken testFilipa Lacerda2016-11-192-7/+22
| * | | | | | | | | | | Changes for stop url to pathFilipa Lacerda2016-11-192-23/+1
| * | | | | | | | | | | Try to fix testsKamil Trzcinski2016-11-181-4/+5
| * | | | | | | | | | | Expose stop_path for environment to not construct that in frontendKamil Trzcinski2016-11-183-2/+9
| * | | | | | | | | | | Bring back the `commit_url` as it's used by CycleAnalyticsKamil Trzcinski2016-11-182-0/+11
| * | | | | | | | | | | Fix broken testsFilipa Lacerda2016-11-182-11/+11
| * | | | | | | | | | | Do not trigger CI [ci skip]Kamil Trzcinski2016-11-180-0/+0