| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'login-fixups' into 'master' | Rémy Coutable | 2016-10-18 | 5 | -22/+30 |
| |\ | |||||
| | * | 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 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 'fix/pipeline-settings-page' into 'master' | Kamil Trzciński | 2016-10-18 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Reload pipeline settings when saving new settings | Grzegorz Bizon | 2016-10-18 | 1 | -1/+1 |
| * | | | Merge branch 'retry-cancelled-pipelines' into 'master' | Kamil Trzciński | 2016-10-18 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * \ \ | Merge remote-tracking branch 'upstream/master' into retry-cancelled-pipelinesretry-cancelled-pipelines | Lin Jen-Shin | 2016-10-18 | 41 | -671/+1150 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | * | | | Make cancelled pipelines being able to retry | Lin Jen-Shin | 2016-10-17 | 1 | -1/+1 |
| * | | | | Merge branch 'master' into issue_19734_2 | Phil Hughes | 2016-10-18 | 34 | -563/+937 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | Merge branch 'faster_toggle_award_url_helper_method' into 'master' | Yorick Peterse | 2016-10-18 | 1 | -3/+6 |
| | |\ \ \ | |||||
| | | * | | | Execute specific named route method from toggle_award_url helper methodfaster_toggle_award_url_helper_method | Paco Guzman | 2016-10-18 | 1 | -3/+6 |
| | | | |/ | | |/| | |||||
| | * | | | Merge branch 'fix/build-erase-race-condition' into 'master' | Kamil Trzciński | 2016-10-18 | 1 | -3/+7 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | Avoid race condition when expiring artifacts | Grzegorz Bizon | 2016-10-17 | 1 | -3/+7 |
| | * | | | Merge branch 'merge-conflicts-editor-2' into 'master' | Jacob Schatz | 2016-10-18 | 28 | -532/+906 |
| | |\ \ \ | |||||
| | | * | | | 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 | 7 | -113/+212 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' into merge-conflicts-editor-2 | Sean McGivern | 2016-10-17 | 155 | -1062/+2477 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | | Add syntax highlighting to files | Alfredo Sumaran | 2016-10-13 | 1 | -0/+1 |
| | | * | | | | Fix discard message | Alfredo Sumaran | 2016-10-13 | 1 | -1/+1 |
| | | * | | | | 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 |
| | | * | | | | Add more tests to check conflicts resolution | Alfredo Sumaran | 2016-10-13 | 2 | -2/+4 |
| | | * | | | | Improve components for PhantomJs compatibility | Alfredo Sumaran | 2016-10-13 | 17 | -76/+140 |
| | | * | | | | Use .some instead of .find for phantomjs compatibility | Alfredo Sumaran | 2016-10-13 | 1 | -9/+1 |
| | | * | | | | Improve diff view switching and components | Alfredo Sumaran | 2016-10-13 | 5 | -56/+49 |
| | | * | | | | Do not show Diff view switcher if all files are can be only resolved with an ... | Alfredo Sumaran | 2016-10-13 | 3 | -2/+15 |
| | | * | | | | Ability to resolve conflicts for files with `text-editor` as conflict type | Alfredo Sumaran | 2016-10-13 | 6 | -158/+176 |
| | | * | | | | Refactor JS code | Alfredo Sumaran | 2016-10-13 | 8 | -9/+542 |
| | | * | | | | check if files is set before counting | Alfredo Sumaran | 2016-10-13 | 1 | -0/+4 |
| | | * | | | | Replace loading text with spinner | Alfredo Sumaran | 2016-10-13 | 2 | -3/+4 |
| | | * | | | | Style for resolve conflicts form | Alfredo Sumaran | 2016-10-13 | 2 | -10/+21 |
| | | * | | | | Styles for discard alert | Alfredo Sumaran | 2016-10-13 | 3 | -6/+18 |
| | | * | | | | Replace textarea with Ace editor | Alfredo Sumaran | 2016-10-13 | 4 | -8/+30 |
| | | * | | | | Implement editor to manually resolve merge conflicts | Alfredo Sumaran | 2016-10-13 | 11 | -73/+300 |
| | | * | | | | Fix specs | Sean McGivern | 2016-10-13 | 1 | -2/+2 |
| | | * | | | | Allow setting content for resolutions | Sean McGivern | 2016-10-13 | 4 | -11/+42 |
| | * | | | | | Merge branch 'fix-username-validator-endpoint' into 'master' | Stan Hu | 2016-10-17 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Update endpoint to username validator | Alfredo Sumaran | 2016-10-17 | 1 | -1/+1 |
| | * | | | | | | Merge branch '21395-standarize-markdown-headlines' into 'master' | Annabel Dunstone Gray | 2016-10-17 | 3 | -24/+17 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | | * | | | | | change border color to variable | tauriedavis | 2016-10-17 | 2 | -4/+4 |
| | | * | | | | | Apply better hierarchy to markdown headers and issue/mr titles21395-standarize-markdown-headlines | tauriedavis | 2016-10-17 | 3 | -21/+14 |
| | | | |_|_|/ | | |/| | | | |||||
| * | | | | | | Add visibility level to project repositoryissue_19734_2 | Felipe Artur | 2016-10-17 | 13 | -172/+286 |
| |/ / / / / | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |