summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Disallow runner to pick untagged build if configuredGrzegorz Bizon2016-05-192-11/+31
* Extend runner config options for untagged jobsGrzegorz Bizon2016-05-195-35/+51
* Add form for runner config to run untagged jobsGrzegorz Bizon2016-05-191-0/+6
* Add runner db field for ability to run untagged jobsGrzegorz Bizon2016-05-192-0/+12
* Merge branch '12724-wrong-sorting-of-commit-order-in-mr-view' into 'master' Rémy Coutable2016-05-193-5/+3
|\
| * Chunk commits by date in lists12724-wrong-sorting-of-commit-order-in-mr-viewSean McGivern2016-05-192-2/+2
| * Maintain commit order in MRsSean McGivern2016-05-181-3/+1
* | Merge branch 'deploy-key-alert-color' into 'master' Jacob Schatz2016-05-194-5/+5
|\ \
| * | Fixed project settings alert colorsdeploy-key-alert-colorPhil Hughes2016-05-164-5/+5
* | | Merge branch 'project-variables-ui' into 'master' Jacob Schatz2016-05-199-55/+141
|\ \ \
| * | | Changed table border colorproject-variables-uiPhil Hughes2016-05-163-14/+15
| * | | Updated project variable testsPhil Hughes2016-05-162-19/+48
| * | | Project variables UIPhil Hughes2016-05-167-38/+94
| |/ /
* | | Merge branch 'simplify-animation-css' into 'master' Jacob Schatz2016-05-195-12/+74
|\ \ \
| * | | Replace animate.css with a smaller subset of animations.Connor Shea2016-05-135-12/+74
* | | | Merge branch 'doc-broken-links' into 'master' Jeroen van Baarsen2016-05-193-2/+3
|\ \ \ \
| * | | | Fix broken linksdoc-broken-linksAchilleas Pipinellis2016-04-193-2/+3
* | | | | Merge branch 'patch-1' into 'master' Rémy Coutable2016-05-192-1/+2
|\ \ \ \ \
| * | | | | Added CHANGELOG entryLudovic Perrine2016-05-191-0/+1
| * | | | | Fixed advice on invalid permissions on upload pathJazz2016-05-191-1/+1
* | | | | | Merge branch 'migration-helpers' into 'master' Robert Speicher2016-05-196-2/+393
|\ \ \ \ \ \
| * | | | | | Fixed typos in migration templatesmigration-helpersYorick Peterse2016-05-192-2/+2
| * | | | | | Remove left-over use of strip_heredocYorick Peterse2016-05-191-1/+1
| * | | | | | Removed stray strip_heredoc from migration helpersYorick Peterse2016-05-131-1/+1
| * | | | | | Fixed styling per Rubocop pedanticsYorick Peterse2016-05-122-5/+7
| * | | | | | Tell Rubocop to ignore lib/templatesYorick Peterse2016-05-121-1/+2
| * | | | | | Link to migration guide in migration templatesYorick Peterse2016-05-122-0/+6
| * | | | | | Updated migration styleguide for new helpersYorick Peterse2016-05-121-2/+44
| * | | | | | Added custom migration generator templatesYorick Peterse2016-05-122-0/+84
| * | | | | | Added helper methods for database migrationsYorick Peterse2016-05-122-0/+256
* | | | | | | Merge branch 'fix-svg-constant-errors' into 'master' Robert Speicher2016-05-192-89/+89
|\ \ \ \ \ \ \
| * | | | | | | Fix warning messages with SVG ALLOWED_ELEMENTSStan Hu2016-05-192-89/+89
* | | | | | | | Merge branch 'mooreniemi/gitlab-ce-issue_15236' into 'master' Robert Speicher2016-05-195-12/+49
|\ \ \ \ \ \ \ \
| * | | | | | | | Move #create_confidentiality_note to Issues::UpdateServicemooreniemi/gitlab-ce-issue_15236Rémy Coutable2016-05-185-32/+19
| * | | | | | | | Changing the confidentiality of an issue now creates a new system noteAlex Moore-Niemi2016-05-186-7/+57
* | | | | | | | | Merge branch 'revert-3656b5db' into 'master' Stan Hu2016-05-192-1/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Revert "Merge branch 'issues/15127' into 'master'"revert-3656b5dbStan Hu2016-05-192-1/+5
|/ / / / / / / /
* | | | | | | | Merge branch 'issues/15127' into 'master' Stan Hu2016-05-192-5/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | fix #15127 ActiveJob::DeserializationError thrownP.S.V.R2016-04-112-5/+1
* | | | | | | | Merge branch 'issue_17560' into 'master' Robert Speicher2016-05-197-33/+107
|\ \ \ \ \ \ \ \
| * | | | | | | | Mask credentials from URL when import of project has failed.Rubén Dávila2016-05-187-33/+107
* | | | | | | | | Merge branch '17635-remove-unused-project-scopes' into 'master' Robert Speicher2016-05-191-25/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused Project scopes17635-remove-unused-project-scopesRémy Coutable2016-05-181-25/+5
* | | | | | | | | | Merge branch 'fix-changelog' into 'master' Rémy Coutable2016-05-181-8/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix changelog for 7.9.3 [ci-skip]Robert Schilling2016-05-181-8/+5
* | | | | | | | | | Merge branch 'master' into 'master' Hannes Rosenögger2016-05-181-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | fix example urls for (de)associating runners to projectsa-tal2016-02-261-2/+2
* | | | | | | | | | Merge branch 'patch-1' into 'master' Hannes Rosenögger2016-05-181-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: fix git lfs workaround for using http instead of https Felix Ruess2016-02-041-1/+1
* | | | | | | | | | | Merge branch '17628-remove-unused-methods' into 'master' Robert Speicher2016-05-181-9/+0
|\ \ \ \ \ \ \ \ \ \ \