summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 8.13.0-rc3v8.13.0-rc3Rémy Coutable2016-10-181-1/+1
* Merge remote-tracking branch 'origin/master' into 8-13-stableRémy Coutable2016-10-187-84/+101
|\
| * Merge branch 'login-fixups' into 'master' Rémy Coutable2016-10-186-24/+32
| |\
| | * Use border-radius-default instead of hardcoding value.login-fixupsBryce Johnson2016-10-181-4/+4
| | * Fix aesthetic issues on CROWD login.Bryce Johnson2016-10-181-2/+2
| | * Fix top border-radius of tabs.Bryce Johnson2016-10-181-0/+5
| | * Contain normal signin in loginbox.Bryce Johnson2016-10-181-1/+3
| | * Fix login tests for crowd to use #crowd.Bryce Johnson2016-10-181-2/+2
| | * Fix superfluous margin on new_ldap submit.Bryce Johnson2016-10-181-1/+1
| | * Use correct verbiage for username in login form.Bryce Johnson2016-10-181-1/+1
| | * Fix href to server pane.Bryce Johnson2016-10-181-1/+1
| | * Fix tab refs in ldap tabs.Bryce Johnson2016-10-181-3/+3
| | * Split login box into different panes, for ldap enabled screens.Bryce Johnson2016-10-181-14/+15
| | * Fix aesthetic issues on LDAP login.Bryce Johnson2016-10-181-2/+2
| * | Merge branch 'zj-grapify-commits' into 'master' Rémy Coutable2016-10-181-60/+69
| |\ \
| | * | Use GrapeDSL for commitsZ.J. van de Weg2016-10-181-60/+69
* | | | Merge remote-tracking branch 'origin/master' into 8-13-stableRémy Coutable2016-10-18108-939/+2269
|\ \ \ \ | |/ / /
| * | | 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 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