Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sh-fix-broken-note-award-emoji' into 'master' | Robert Speicher | 2016-10-19 | 1 | -5/+41 |
|\ | |||||
| * | Add spec for toggling award emoji on issue notessh-fix-broken-note-award-emoji | Stan Hu | 2016-10-18 | 1 | -5/+41 |
* | | Merge branch '22191-delete-dynamic-envs-mr' into 'master' | Rémy Coutable | 2016-10-19 | 3 | -41/+126 |
|\ \ | |/ |/| | |||||
| * | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mr | Kamil Trzcinski | 2016-10-18 | 2 | -1/+32 |
| |\ | |||||
| * | | Merge two scenarios into one | Kamil Trzcinski | 2016-10-18 | 1 | -8/+2 |
| * | | Fix remaining offenses | Kamil Trzcinski | 2016-10-18 | 1 | -1/+1 |
| * | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr | Kamil Trzcinski | 2016-10-18 | 1 | -14/+123 |
| |\ \ | |||||
| * | | | Fix remaining specs failures | Kamil Trzcinski | 2016-10-18 | 1 | -4/+6 |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 22191-delete-dy... | Kamil Trzcinski | 2016-10-17 | 2 | -0/+54 |
| |\ \ \ | |||||
| * | | | | Fix specs | Kamil Trzcinski | 2016-10-17 | 1 | -9/+9 |
| * | | | | Fixes typo | Filipa Lacerda | 2016-10-17 | 1 | -1/+1 |
| * | | | | Updates class name for consistency | Filipa Lacerda | 2016-10-17 | 1 | -4/+4 |
| * | | | | Fix specs | Kamil Trzcinski | 2016-10-17 | 3 | -56/+42 |
| * | | | | Fix environments specs | Kamil Trzcinski | 2016-10-17 | 1 | -19/+57 |
| * | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr | Kamil Trzcinski | 2016-10-17 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge commit '7d12683' into 22191-delete-dynamic-envs-mr [ci skip] | Kamil Trzcinski | 2016-10-17 | 2 | -3/+68 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixes broken tests | Filipa Lacerda | 2016-10-11 | 2 | -3/+53 |
| | * | | | | | Adds tests to verify if tabs are rendered | Filipa Lacerda | 2016-10-10 | 1 | -0/+15 |
| * | | | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr | Kamil Trzcinski | 2016-10-17 | 22 | -75/+500 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Updates failing test | Filipa Lacerda | 2016-10-06 | 1 | -5/+5 |
* | | | | | | | Merge branch '21192-retried-builds' into 'master' | Jacob Schatz | 2016-10-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Remove unnecessary retried check & fix test failures | Annabel Dunstone Gray | 2016-10-18 | 1 | -1/+1 |
* | | | | | | | Merge branch 'fix/pipeline-settings-page' into 'master' | Kamil Trzciński | 2016-10-18 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | 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 | 1 | -1/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'master' into issue_19734_2 | Phil Hughes | 2016-10-18 | 1 | -14/+123 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'merge-conflicts-editor-2' into 'master' | Jacob Schatz | 2016-10-18 | 1 | -14/+123 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Merge branch 'master' into merge-conflicts-editor-2 | Alfredo Sumaran | 2016-10-17 | 1 | -1/+1 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Merge branch 'master' into merge-conflicts-editor-2 | Sean McGivern | 2016-10-17 | 14 | -59/+233 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Add more tests to check conflicts resolution | Alfredo Sumaran | 2016-10-13 | 1 | -49/+96 |
| | * | | | | Improve diff view switching and components | Alfredo Sumaran | 2016-10-13 | 1 | -5/+5 |
| | * | | | | Ability to resolve conflicts for files with `text-editor` as conflict type | Alfredo Sumaran | 2016-10-13 | 1 | -1/+37 |
| | * | | | | Refactor JS code | Alfredo Sumaran | 2016-10-13 | 1 | -2/+2 |
| | * | | | | Fix editor spec | Sean McGivern | 2016-10-13 | 1 | -0/+1 |
| | * | | | | Add tests to check if files are resolved with Edit Inline mode | Alfredo Sumaran | 2016-10-13 | 1 | -0/+26 |
| | * | | | | We now support resolving conflicts with ambiguous markers | Douwe Maan | 2016-10-13 | 1 | -1/+0 |
* | | | | | | Add visibility level to project repositoryissue_19734_2 | Felipe Artur | 2016-10-17 | 1 | -0/+30 |
|/ / / / / | |||||
* | | | | | Merge branch 'dz-rename-user-routes' into 'master' | Robert Speicher | 2016-10-17 | 1 | -0/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Update users routing spec | Dmitriy Zaporozhets | 2016-10-13 | 1 | -0/+12 |
* | | | | | | Fixed find file keyboard navigationfind-file-enter-fix | Phil Hughes | 2016-10-17 | 1 | -0/+42 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'ebraminio/gitlab-ce-master' into 'master' | Robert Speicher | 2016-10-17 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Add RTL support to markdown renderer | Ebrahim Byagowi | 2016-10-16 | 1 | -1/+1 |
* | | | | | Fix broken rspec in compare text | Stan Hu | 2016-10-16 | 1 | -1/+1 |
* | | | | | Fix broken Spinach tests caused by changes in !6550 | Stan Hu | 2016-10-16 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Don't use member properties in users_spec, and remove loading ref. | Bryce Johnson | 2016-10-15 | 1 | -5/+2 |
* | | | | Back off the array spreading, bc poltergeist freaks out. | Bryce Johnson | 2016-10-15 | 1 | -3/+3 |
* | | | | Update filled in field for two_factor auth to use id. | Bryce Johnson | 2016-10-15 | 1 | -1/+1 |
* | | | | Shush rubocop. | Bryce Johnson | 2016-10-15 | 1 | -2/+2 |
* | | | | Get tests passing. | Bryce Johnson | 2016-10-15 | 1 | -4/+5 |
* | | | | Make UX upgrades to SignIn/Register views. | Bryce Johnson | 2016-10-15 | 3 | -14/+40 |