summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1838-218/+506
|\
| * Merge branch 'fix/pipeline-settings-page' into 'master' Kamil Trzciński2016-10-183-2/+4
| |\
| | * Add Changelog entry for pipeline settings button fixfix/pipeline-settings-pageGrzegorz Bizon2016-10-181-0/+1
| | * Move specs for project pipeline settings pageGrzegorz Bizon2016-10-181-0/+0
| | * Reload pipeline settings when saving new settingsGrzegorz Bizon2016-10-182-2/+3
| * | Merge branch 'retry-cancelled-pipelines' into 'master' Kamil Trzciński2016-10-183-6/+21
| |\ \
| | * \ Merge remote-tracking branch 'upstream/master' into retry-cancelled-pipelinesretry-cancelled-pipelinesLin Jen-Shin2016-10-1888-860/+2072
| | |\ \
| | * | | Add CHANGELOG entryLin Jen-Shin2016-10-171-0/+1
| | * | | Make cancelled pipelines being able to retryLin Jen-Shin2016-10-172-6/+20
| * | | | Merge branch 'issue_19734_2' into 'master' Sean McGivern2016-10-1821-174/+398
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into issue_19734_2Phil Hughes2016-10-1853-634/+1635
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Add visibility level to project repositoryissue_19734_2Felipe Artur2016-10-1721-174/+398
| * | | | | Merge branch 'looser-time-in-specs' into 'master' Douwe Maan2016-10-188-14/+27
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add a be_like_time matcher and use it in specsNick Thomas2016-10-178-14/+27
| * | | | | Merge branch 'adam-fix-mr-diff-symlink-file-conversion' into 'master' Sean McGivern2016-10-183-5/+10
| |\ \ \ \ \
| | * | | | | Fix the diff in the merge request view when converting a symlink to a regular...adam-fix-mr-diff-symlink-file-conversionAdam Niedzielski2016-10-173-5/+10
| * | | | | | Merge branch 'faster_toggle_award_url_helper_method' into 'master' Yorick Peterse2016-10-182-3/+7
| |\ \ \ \ \ \
| | * | | | | | Execute specific named route method from toggle_award_url helper methodfaster_toggle_award_url_helper_methodPaco Guzman2016-10-182-3/+7
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'fix/build-erase-race-condition' into 'master' Kamil Trzciński2016-10-183-15/+40
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix Changelog entry for fix to CI artifacts eraseGrzegorz Bizon2016-10-181-1/+0
| | * | | | | Add Changelog entry to fix for removing artifactsfix/build-erase-race-conditionGrzegorz Bizon2016-10-171-0/+2
| | * | | | | Avoid race condition when expiring artifactsGrzegorz Bizon2016-10-172-15/+39
* | | | | | | Merge two scenarios into oneKamil Trzcinski2016-10-181-8/+2
* | | | | | | Fix remaining offensesKamil Trzcinski2016-10-182-4/+5
* | | | | | | Add logical validation to gitlab-ci.ymlKamil Trzcinski2016-10-183-1/+77
* | | | | | | Add `stop!` to `environment`Kamil Trzcinski2016-10-183-4/+50
* | | | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1845-587/+1561
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'merge-conflicts-editor-2' into 'master' Jacob Schatz2016-10-1844-586/+1560
| |\ \ \ \ \ \
| | * | | | | | Provide better error message to the usermerge-conflicts-editor-2Alfredo Sumaran2016-10-171-1/+1
| | * | | | | | Merge branch 'master' into merge-conflicts-editor-2Alfredo Sumaran2016-10-1721-150/+317
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-17246-1531/+3847
| | |\ \ \ \ \ \
| | * | | | | | | Update CHANGELOGAlfredo Sumaran2016-10-131-1/+0
| | * | | | | | | Add syntax highlighting to filesAlfredo Sumaran2016-10-131-0/+1
| | * | | | | | | Add blob_ace_mode to conflict content responseSean McGivern2016-10-133-0/+17
| | * | | | | | | Fix discard messageAlfredo Sumaran2016-10-131-1/+1
| | * | | | | | | Update CHANGELOGAlfredo Sumaran2016-10-131-0/+2
| | * | | | | | | Use plain JS to get elements and data and valuesAlfredo Sumaran2016-10-131-5/+5
| | * | | | | | | Remove unused filesAlfredo Sumaran2016-10-132-550/+0
| | * | | | | | | Fix column limit on mysqlAlfredo Sumaran2016-10-131-1/+1
| | * | | | | | | Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-134-51/+101
| | * | | | | | | Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-1317-76/+140
| | * | | | | | | Use .some instead of .find for phantomjs compatibilityAlfredo Sumaran2016-10-131-9/+1
| | * | | | | | | Improve diff view switching and componentsAlfredo Sumaran2016-10-136-61/+54
| | * | | | | | | Do not show Diff view switcher if all files are can be only resolved with an ...Alfredo Sumaran2016-10-133-2/+15
| | * | | | | | | Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-137-159/+213
| | * | | | | | | Refactor JS codeAlfredo Sumaran2016-10-1310-11/+545
| | * | | | | | | Fix editor specSean McGivern2016-10-131-0/+1
| | * | | | | | | Add tests to check if files are resolved with Edit Inline modeAlfredo Sumaran2016-10-131-0/+26
| | * | | | | | | check if files is set before countingAlfredo Sumaran2016-10-131-0/+4
| | * | | | | | | Replace loading text with spinnerAlfredo Sumaran2016-10-132-3/+4
View Lorry Controller Status