Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update VERSION to 8.13.0-rc3v8.13.0-rc3 | Rémy Coutable | 2016-10-18 | 1 | -1/+1 |
* | Merge remote-tracking branch 'origin/master' into 8-13-stable | Rémy Coutable | 2016-10-18 | 7 | -84/+101 |
|\ | |||||
| * | Merge branch 'login-fixups' into 'master' | Rémy Coutable | 2016-10-18 | 6 | -24/+32 |
| |\ | |||||
| | * | Use border-radius-default instead of hardcoding value.login-fixups | Bryce Johnson | 2016-10-18 | 1 | -4/+4 |
| | * | Fix aesthetic issues on CROWD login. | Bryce Johnson | 2016-10-18 | 1 | -2/+2 |
| | * | Fix top border-radius of tabs. | Bryce Johnson | 2016-10-18 | 1 | -0/+5 |
| | * | Contain normal signin in loginbox. | Bryce Johnson | 2016-10-18 | 1 | -1/+3 |
| | * | Fix login tests for crowd to use #crowd. | Bryce Johnson | 2016-10-18 | 1 | -2/+2 |
| | * | Fix superfluous margin on new_ldap submit. | Bryce Johnson | 2016-10-18 | 1 | -1/+1 |
| | * | Use correct verbiage for username in login form. | Bryce Johnson | 2016-10-18 | 1 | -1/+1 |
| | * | Fix href to server pane. | Bryce Johnson | 2016-10-18 | 1 | -1/+1 |
| | * | Fix tab refs in ldap tabs. | Bryce Johnson | 2016-10-18 | 1 | -3/+3 |
| | * | Split login box into different panes, for ldap enabled screens. | Bryce Johnson | 2016-10-18 | 1 | -14/+15 |
| | * | Fix aesthetic issues on LDAP login. | Bryce Johnson | 2016-10-18 | 1 | -2/+2 |
| * | | Merge branch 'zj-grapify-commits' into 'master' | Rémy Coutable | 2016-10-18 | 1 | -60/+69 |
| |\ \ | |||||
| | * | | Use GrapeDSL for commits | Z.J. van de Weg | 2016-10-18 | 1 | -60/+69 |
* | | | | Merge remote-tracking branch 'origin/master' into 8-13-stable | Rémy Coutable | 2016-10-18 | 108 | -939/+2269 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'fix/pipeline-settings-page' into 'master' | Kamil Trzciński | 2016-10-18 | 3 | -2/+4 |
| |\ \ \ | |||||
| | * | | | Add Changelog entry for pipeline settings button fixfix/pipeline-settings-page | Grzegorz Bizon | 2016-10-18 | 1 | -0/+1 |
| | * | | | Move specs for project pipeline settings page | Grzegorz Bizon | 2016-10-18 | 1 | -0/+0 |
| | * | | | Reload pipeline settings when saving new settings | Grzegorz Bizon | 2016-10-18 | 2 | -2/+3 |
| * | | | | Merge branch 'retry-cancelled-pipelines' into 'master' | Kamil Trzciński | 2016-10-18 | 3 | -6/+21 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' into retry-cancelled-pipelinesretry-cancelled-pipelines | Lin Jen-Shin | 2016-10-18 | 88 | -860/+2072 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Add CHANGELOG entry | Lin Jen-Shin | 2016-10-17 | 1 | -0/+1 |
| | * | | | | Make cancelled pipelines being able to retry | Lin Jen-Shin | 2016-10-17 | 2 | -6/+20 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'issue_19734_2' into 'master' | Sean McGivern | 2016-10-18 | 21 | -174/+398 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into issue_19734_2 | Phil Hughes | 2016-10-18 | 53 | -634/+1635 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Add visibility level to project repositoryissue_19734_2 | Felipe Artur | 2016-10-17 | 21 | -174/+398 |
| * | | | | | Merge branch 'looser-time-in-specs' into 'master' | Douwe Maan | 2016-10-18 | 8 | -14/+27 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Add a be_like_time matcher and use it in specs | Nick Thomas | 2016-10-17 | 8 | -14/+27 |
| * | | | | | Merge branch 'adam-fix-mr-diff-symlink-file-conversion' into 'master' | Sean McGivern | 2016-10-18 | 3 | -5/+10 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix the diff in the merge request view when converting a symlink to a regular...adam-fix-mr-diff-symlink-file-conversion | Adam Niedzielski | 2016-10-17 | 3 | -5/+10 |
| * | | | | | | Merge branch 'faster_toggle_award_url_helper_method' into 'master' | Yorick Peterse | 2016-10-18 | 2 | -3/+7 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Execute specific named route method from toggle_award_url helper methodfaster_toggle_award_url_helper_method | Paco Guzman | 2016-10-18 | 2 | -3/+7 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge branch 'fix/build-erase-race-condition' into 'master' | Kamil Trzciński | 2016-10-18 | 3 | -15/+40 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Fix Changelog entry for fix to CI artifacts erase | Grzegorz Bizon | 2016-10-18 | 1 | -1/+0 |
| | * | | | | | Add Changelog entry to fix for removing artifactsfix/build-erase-race-condition | Grzegorz Bizon | 2016-10-17 | 1 | -0/+2 |
| | * | | | | | Avoid race condition when expiring artifacts | Grzegorz Bizon | 2016-10-17 | 2 | -15/+39 |
| * | | | | | | Merge branch 'merge-conflicts-editor-2' into 'master' | Jacob Schatz | 2016-10-18 | 44 | -586/+1560 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Provide better error message to the usermerge-conflicts-editor-2 | Alfredo Sumaran | 2016-10-17 | 1 | -1/+1 |
| | * | | | | | | Merge branch 'master' into merge-conflicts-editor-2 | Alfredo Sumaran | 2016-10-17 | 21 | -150/+317 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | * | | | | | | Merge branch 'master' into merge-conflicts-editor-2 | Sean McGivern | 2016-10-17 | 246 | -1531/+3847 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Update CHANGELOG | Alfredo Sumaran | 2016-10-13 | 1 | -1/+0 |
| | * | | | | | | | Add syntax highlighting to files | Alfredo Sumaran | 2016-10-13 | 1 | -0/+1 |
| | * | | | | | | | Add blob_ace_mode to conflict content response | Sean McGivern | 2016-10-13 | 3 | -0/+17 |
| | * | | | | | | | Fix discard message | Alfredo Sumaran | 2016-10-13 | 1 | -1/+1 |
| | * | | | | | | | Update CHANGELOG | Alfredo Sumaran | 2016-10-13 | 1 | -0/+2 |
| | * | | | | | | | Use plain JS to get elements and data and values | Alfredo Sumaran | 2016-10-13 | 1 | -5/+5 |
| | * | | | | | | | Remove unused files | Alfredo Sumaran | 2016-10-13 | 2 | -550/+0 |
| | * | | | | | | | Fix column limit on mysql | Alfredo Sumaran | 2016-10-13 | 1 | -1/+1 |