Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix StrongAttibutes error with Ruby 2.124730-broken-master | Rémy Coutable | 2016-11-21 | 1 | -4/+5 |
* | Merge branch 'fix/cycle-analytics-permissions' into 'master' | Sean McGivern | 2016-11-21 | 5 | -1/+183 |
|\ | |||||
| * | refactored a couple of things based on feedbackfix/cycle-analytics-permissions | James Lopez | 2016-11-21 | 10 | -25/+19 |
| * | fix spec failure | James Lopez | 2016-11-21 | 1 | -1/+1 |
| * | Added permissions per stage to cycle analytics endpoint | James Lopez | 2016-11-21 | 13 | -11/+199 |
* | | Merge branch '24552-js-environment-timeago-is-not-rendered-and-text-shows-obj... | Fatih Acet | 2016-11-21 | 2 | -2/+54 |
|\ \ | |||||
| * | | Fix timeago rendering for environment timeago24552-js-environment-timeago-is-not-rendered-and-text-shows-object-object-in-mr-widget | Clement Ho | 2016-11-19 | 2 | -2/+54 |
* | | | Merge branch '24616-mr-shows-the-build-for-this-merge-request-failed-although... | Kamil Trzciński | 2016-11-21 | 7 | -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-running | Rémy Coutable | 2016-11-21 | 7 | -12/+61 |
* | | | | Merge branch 'fix/do-not-add-todo-when-build-allowed-to-fail' into 'master' 24710-external-statuses-pipeline | Kamil Trzciński | 2016-11-21 | 5 | -9/+47 |
|\ \ \ \ | |||||
| * | | | | Add documentation about todos and failed builds | Grzegorz Bizon | 2016-11-21 | 1 | -2/+4 |
| * | | | | Add Changelog entry for failed builds todos fix | Grzegorz Bizon | 2016-11-21 | 1 | -0/+4 |
| * | | | | Do not create TODO when build is allowed to fail | Grzegorz Bizon | 2016-11-21 | 3 | -7/+39 |
* | | | | | Merge branch 'ee-870-backport' into 'master' | Sean McGivern | 2016-11-21 | 13 | -17/+85 |
|\ \ \ \ \ | |||||
| * | | | | | Backport some changes done from Time Tracking feature in EE.ee-870-backport | Ruben Davila | 2016-11-18 | 13 | -17/+85 |
* | | | | | | Merge branch 'grapify-users-api' into 'master' | Rémy Coutable | 2016-11-21 | 3 | -306/+320 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Grapify the users APIgrapify-users-api | Robert Schilling | 2016-11-21 | 3 | -307/+321 |
* | | | | | | | Merge branch 'make-prepare-build-sh-compat' into 'master' | Rémy Coutable | 2016-11-21 | 1 | -4/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove bashism from scripts/prepare_build.sh | Nick Thomas | 2016-11-18 | 1 | -4/+5 |
* | | | | | | | | Merge branch 'dz-fix-group-name-dot' into 'master' | Rémy Coutable | 2016-11-21 | 3 | -8/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix 404 on some group pages when name contains dotdz-fix-group-name-dot | Dmitriy Zaporozhets | 2016-11-21 | 3 | -8/+25 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'create-pipeline-endpoint' into 'master' | Rémy Coutable | 2016-11-21 | 4 | -0/+117 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add api endpoint for creating a pipeline | Ido Leibovich | 2016-11-18 | 4 | -0/+117 |
* | | | | | | | | | Merge branch 'issue_5541' into 'master' | Sean McGivern | 2016-11-21 | 11 | -32/+92 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Allow enabling and disabling commit and MR events for JIRAissue_5541 | Felipe Artur | 2016-11-18 | 11 | -32/+92 |
* | | | | | | | | | Merge branch 'remove-unnecessary-self-from-user-model' into 'master' | Rémy Coutable | 2016-11-21 | 2 | -54/+57 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove unnecessary self from user model | Semyon Pupkov | 2016-11-19 | 2 | -54/+57 |
* | | | | | | | | | | Merge branch 'use-build-in-broadcast-message-spec' into 'master' | Rémy Coutable | 2016-11-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Use build instead create in BroadcastMessage model spec | Semyon Pupkov | 2016-11-19 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch '24627-fix-bad-mr-error-message' into 'master' | Rémy Coutable | 2016-11-21 | 3 | -2/+13 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix regression in Merge request form | Alex Sanford | 2016-11-19 | 3 | -2/+13 |
* | | | | | | | | | | Merge branch 'super-secret-login-upgrade' into 'master' | Fatih Acet | 2016-11-19 | 2 | -25/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Un-un-revert signin tab order fix.super-secret-login-upgrade | Bryce Johnson | 2016-11-18 | 2 | -25/+2 |
* | | | | | | | | | | | Merge branch 'fix-db-schema' into 'master' | Kamil Trzciński | 2016-11-19 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Remove duplicate sidekiq throttling parametersfix-db-schema | Kamil Trzcinski | 2016-11-19 | 1 | -3/+0 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'fix-typo-in-gitlab-flow' into 'master' | Achilleas Pipinellis | 2016-11-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | fix typo in gitlab_flow.md ('munch'->'much') | kkkkkkkk | 2016-11-19 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'patch-7' into 'master' | Achilleas Pipinellis | 2016-11-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix wrong link | ebuildy | 2016-11-19 | 1 | -1/+1 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch '24673-broken-test-in-merge_request_widget_spec-js' into 'master' | Jacob Schatz | 2016-11-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix spec24673-broken-test-in-merge_request_widget_spec-js | Clement Ho | 2016-11-18 | 1 | -2/+2 |
* | | | | | | | | | | | | Merge branch '22539-display-folders' into 'master' | Fatih Acet | 2016-11-19 | 43 | -329/+2349 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix test22539-display-folders | Filipa Lacerda | 2016-11-19 | 1 | -22/+11 |
| * | | | | | | | | | | | Fix broken test | Filipa Lacerda | 2016-11-19 | 2 | -7/+22 |
| * | | | | | | | | | | | Changes for stop url to path | Filipa Lacerda | 2016-11-19 | 2 | -23/+1 |
| * | | | | | | | | | | | Try to fix tests | Kamil Trzcinski | 2016-11-18 | 1 | -4/+5 |
| * | | | | | | | | | | | Expose stop_path for environment to not construct that in frontend | Kamil Trzcinski | 2016-11-18 | 3 | -2/+9 |
| * | | | | | | | | | | | Bring back the `commit_url` as it's used by CycleAnalytics | Kamil Trzcinski | 2016-11-18 | 2 | -0/+11 |
| * | | | | | | | | | | | Fix broken tests | Filipa Lacerda | 2016-11-18 | 2 | -11/+11 |
| * | | | | | | | | | | | Do not trigger CI [ci skip] | Kamil Trzcinski | 2016-11-18 | 0 | -0/+0 |