summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added tests to dateTime utility getDayName methoddate-time-to-day-testsPhil Hughes2016-07-181-0/+31
* Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-1835-304/+507
|\
| * Remove `lock_version` from the `merge_requests` table.undo-revert-of-4892Timothy Andrew2016-07-181-1/+0
| * Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-1835-304/+508
* | Merge branch 'master' into 'master' Jacob Schatz2016-07-182-1/+2
|\ \
| * | Update CHANGELOG fix indenting.eanplatter2016-07-181-1/+1
| * | Fix activity heatmap to show proper day name.eanplatter2016-07-162-1/+2
* | | Merge branch '19928-nomethoderror-undefined-method-id-for-nil-nilclass' into ...Rémy Coutable2016-07-182-1/+21
|\ \ \
| * | | Don't blow up in tree view on empty repoSean McGivern2016-07-182-1/+21
* | | | Merge branch '18593-avoid-parse_html-when-rinku-didnt-do-anything' into 'mast...Yorick Peterse2016-07-183-0/+23
|\ \ \ \
| * | | | Don't parse Rinku returned value to DocFragment when it didn't change the ori...18593-avoid-parse_html-when-rinku-didnt-do-anythingPaco Guzman2016-07-183-0/+23
* | | | | Merge branch 'fix-track-user-migration' into 'master' Rémy Coutable2016-07-181-0/+2
|\ \ \ \ \
| * | | | | Disable transaction when adding index for Ci::PipelineKamil Trzcinski2016-07-181-0/+2
|/ / / / /
* | | | | Merge branch 'store-variables-and-when-in-builds-table' into 'master' Rémy Coutable2016-07-189-125/+151
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into store-variables...store-variables-and-when-in-builds-tableKamil Trzcinski2016-07-18111-1673/+1979
| |\ \ \ \
| * | | | | Refactor gitlab_ci_yaml_processor variables testsKamil Trzcinski2016-07-171-52/+76
| * | | | | Remove irrelevant commentsKamil Trzcinski2016-07-161-14/+0
| * | | | | Fix gitlab_ci_yaml_processor_spec.rbKamil Trzcinski2016-07-161-5/+5
| * | | | | Fix AddWhenAndYamlVariablesToCiBuilds migrationKamil Trzcinski2016-07-161-1/+1
| * | | | | Fix gitlab_ci_yaml_processor_spec.rbKamil Trzcinski2016-07-161-1/+1
| * | | | | Store when and yaml variables in builds tableKamil Trzcinski2016-07-169-73/+89
* | | | | | Merge branch 'docker-registry-work-with-redirect' into 'master' Rémy Coutable2016-07-185-35/+138
|\ \ \ \ \ \
| * | | | | | Update CHANGELOGdocker-registry-work-with-redirectKamil Trzciński2016-07-151-1/+0
| * | | | | | Make rubocop happyKamil Trzcinski2016-07-151-1/+1
| * | | | | | Add CHANGELOGKamil Trzcinski2016-07-151-0/+1
| * | | | | | Explicitly remove authorization token and make sure that invalid addresses ar...Kamil Trzcinski2016-07-153-51/+122
| * | | | | | Allow blob to be redirectedKamil Trzcinski2016-07-151-3/+34
| * | | | | | Make docker registry work with location redirects when external storage is usedKamil Trzcinski2016-07-152-1/+2
* | | | | | | Merge branch 'pending-tab' into 'master' Rémy Coutable2016-07-187-21/+90
|\ \ \ \ \ \ \
| * | | | | | | Modify test for Build tabsKatarzyna Kobierska2016-07-181-18/+26
| * | | | | | | Add tests to project builds for pending tabKatarzyna Kobierska2016-07-182-5/+13
| * | | | | | | Remove unused .js-running-count classKatarzyna Kobierska2016-07-182-6/+6
| * | | | | | | Add test for new pending tab and update tests for running tabKatarzyna Kobierska2016-07-181-1/+35
| * | | | | | | Add Pending Tab to Admin BuildsKatarzyna Kobierska2016-07-185-4/+23
* | | | | | | | Merge branch 'fix/import-no-repo' into 'master' Rémy Coutable2016-07-185-10/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | added changelogJames Lopez2016-07-181-0/+1
| * | | | | | | allow empty repos on import/exportJames Lopez2016-07-184-10/+5
|/ / / / / / /
* | | | | | | Merge branch 'api-isssues-due-date' into 'master' Rémy Coutable2016-07-185-13/+53
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | API: Expose due_date for issuesapi-isssues-due-dateRobert Schilling2016-07-125-13/+53
* | | | | | | Merge branch 'track-pipeline-user' into 'master' Rémy Coutable2016-07-1813-6/+39
|\ \ \ \ \ \ \
| * | | | | | | Make rubocop happytrack-pipeline-userKamil Trzcinski2016-07-152-2/+2
| * | | | | | | Add index for user_id of pipelineKamil Trzcinski2016-07-152-1/+9
| * | | | | | | Track a user who created a pipelineKamil Trzcinski2016-07-1512-6/+31
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix-deployment-creation-on-build-retry' into 'master' Rémy Coutable2016-07-183-0/+18
|\ \ \ \ \ \ \
| * | | | | | | Fix creation of deployment on build that is retried, redeployed or rollbackfix-deployment-creation-on-build-retryKamil Trzcinski2016-07-163-0/+18
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'allow-to-pull-public-images' into 'master' Rémy Coutable2016-07-186-26/+139
|\ \ \ \ \ \ \
| * | | | | | | Allow to access Container Registry for Public and Internal projectsallow-to-pull-public-imagesKamil Trzcinski2016-07-156-26/+139
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fix-stage-status-show-for-pipelines' into 'master' Rémy Coutable2016-07-183-6/+21
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix stage status shown for pipelinesfix-stage-status-show-for-pipelinesKamil Trzcinski2016-07-153-6/+21
| |/ / / / /
* | | | | | Merge branch 'fix/import-export-retry-settings' into 'master' Rémy Coutable2016-07-182-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |