summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix other use of CreateDeploymentService and makeLin Jen-Shin2017-06-025-15/+40
* Fix a typo: not -> noLin Jen-Shin2017-06-011-1/+1
* Merge all environment url methods, introduce ensure_persisted_environmentLin Jen-Shin2017-06-013-41/+56
* split tests for expanded_environment_urlLin Jen-Shin2017-06-011-4/+25
* Simplify CreateDeploymentService so that it usesLin Jen-Shin2017-06-014-111/+73
* Introduce ci_environment_url which would fallbackLin Jen-Shin2017-06-012-21/+31
* Just use the url from options, not saving it as a columnLin Jen-Shin2017-06-0110-34/+10
* Don't make this change for now to reduce conflictsLin Jen-Shin2017-06-011-9/+9
* Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-01485-2765/+8424
|\
| * Merge branch 'notebook-katex-fixes' into 'master'Filipa Lacerda2017-06-014-8/+81
| |\
| | * added testsnotebook-katex-fixesPhil Hughes2017-05-303-1/+64
| | * fixed inline mathPhil Hughes2017-05-301-1/+2
| | * fixed spacing before inline mathPhil Hughes2017-05-301-1/+2
| | * fixed spacing because of removed &Phil Hughes2017-05-301-1/+2
| | * fixed & being renderedPhil Hughes2017-05-301-3/+2
| | * Fixes multi-line math in notebooksPhil Hughes2017-05-301-7/+15
| * | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-0132-199/+161
| |\ \
| | * | Change no_limits to limitsdm-collapsed-blobDouwe Maan2017-05-317-20/+20
| | * | Fix Diff#too_large? and specsDouwe Maan2017-05-304-53/+25
| | * | Fix Diff#to_hash and #init_from_hashDouwe Maan2017-05-301-0/+3
| | * | Consistent diff and blob size limit namesDouwe Maan2017-05-2932-166/+153
| * | | Merge branch 'dm-emails-are-not-user-references' into 'master'Sean McGivern2017-06-013-0/+10
| |\ \ \
| | * | | Don't match email addresses or foo@bar as user referencesdm-emails-are-not-user-referencesDouwe Maan2017-05-313-0/+10
| * | | | Merge branch 'dm-discussions-n-plus-1' into 'master'Sean McGivern2017-06-016-3/+28
| |\ \ \ \
| | * | | | Move includes call to scopedm-discussions-n-plus-1Douwe Maan2017-05-312-2/+2
| | * | | | Do not try to preload Commits when using Note.includes(:noteable)Douwe Maan2017-05-312-0/+15
| | * | | | Resolve N+1 query issue with discussionsDouwe Maan2017-05-293-2/+12
| | | |/ / | | |/| |
| * | | | Merge branch 'patch-23' into 'master'Sid Sijbrandij2017-05-311-0/+1
| |\ \ \ \
| | * | | | Add GitLab Resources to UniversityTim Anglade2017-05-311-0/+1
| * | | | | Merge branch 'trigger-source' into 'master'Grzegorz Bizon2017-05-3130-35/+116
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into 'trigger-source'Grzegorz Bizon2017-05-31182-851/+3528
| | |\ \ \ \ \
| | * | | | | | Introduce source to pipeline entitytrigger-sourceKamil Trzcinski2017-05-3130-35/+116
| * | | | | | | Revert "Update GITLAB_SHELL_VERSION"Alejandro Rodríguez2017-05-311-1/+1
| * | | | | | | Update GITLAB_SHELL_VERSIONAlejandro Rodríguez2017-05-311-1/+1
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'feature-flags-flipper' into 'master'Dmitriy Zaporozhets2017-05-3117-5/+483
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Add feature toggles through FlipperAlejandro Rodríguez2017-05-3117-5/+483
| |/ / / / /
| * | | | | Merge branch 'dm-gitmodules-parsing' into 'master'Grzegorz Bizon2017-05-313-17/+47
| |\ \ \ \ \
| | * | | | | Remove entry variabledm-gitmodules-parsingDouwe Maan2017-05-311-10/+9
| | * | | | | Make .gitmodules parsing more resilient to syntax errorsDouwe Maan2017-05-303-16/+47
| * | | | | | Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-3169-337/+637
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Rename the other jobsrename-builds-controllerLin Jen-Shin2017-05-311-8/+8
| | * | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-3147-125/+1011
| | |\ \ \ \ \
| | * | | | | | Update jobs_spec for changes from builds_specLin Jen-Shin2017-05-312-496/+18
| | * | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-31315-1972/+4730
| | |\ \ \ \ \ \
| | * | | | | | | Use another scope to add the - prefix, feedback:Lin Jen-Shin2017-05-311-25/+27
| | * | | | | | | Update changelog to reflect the new schemeLin Jen-Shin2017-05-271-1/+1
| | * | | | | | | Should escape the routes because we added -Lin Jen-Shin2017-05-271-1/+1
| | * | | | | | | Use - as the prefix so we don't conflict with namespacesLin Jen-Shin2017-05-2611-26/+13
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-261029-5552/+10902
| | |\ \ \ \ \ \ \
| | * | | | | | | | Routing helpers are no longer neededLin Jen-Shin2017-05-241-3/+0