Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix/ci-runners-token-persistence' into 'master' | Grzegorz Bizon | 2015-12-23 | 3 | -8/+18 |
|\ | |||||
| * | Use method that creates runners registration token | Grzegorz Bizon | 2015-12-23 | 3 | -2/+5 |
| * | Add method that persist ensured token in `TokenAuthenticatable` | Grzegorz Bizon | 2015-12-23 | 1 | -2/+13 |
| * | Fix method that ensures authentication token | Grzegorz Bizon | 2015-12-23 | 1 | -6/+2 |
* | | Merge branch 'rs-update-jquery' into 'master' | Dmitriy Zaporozhets | 2015-12-23 | 2 | -4/+4 |
|\ \ | |||||
| * | | Fix paths for jquery-ui assetsrs-update-jquery | Robert Speicher | 2015-12-22 | 2 | -4/+4 |
| |/ | |||||
* | | Merge branch 'improve_emoji_picker' into 'master' | Dmitriy Zaporozhets | 2015-12-23 | 8 | -56/+1381 |
|\ \ | |||||
| * | | improved emoji picker styleimprove_emoji_picker | Valery Sizov | 2015-12-22 | 2 | -2/+4 |
| * | | TYPO in the comment | Valery Sizov | 2015-12-22 | 1 | -1/+1 |
| * | | customize niceScroll | Valery Sizov | 2015-12-22 | 1 | -1/+1 |
| * | | fix specs | Valery Sizov | 2015-12-22 | 1 | -2/+4 |
| * | | emoji css refactoring | Valery Sizov | 2015-12-22 | 1 | -1262/+1267 |
| * | | base implementation of emoji picker [ci skip] | Valery Sizov | 2015-12-22 | 8 | -56/+1372 |
| |/ | |||||
* | | Merge branch 'fix/ci-lint' into 'master' | Grzegorz Bizon | 2015-12-23 | 4 | -28/+16 |
|\ \ | |/ |/| | |||||
| * | Make CI Lint form synchronousfix/ci-lint | Grzegorz Bizon | 2015-12-22 | 4 | -28/+16 |
* | | Merge branch 'fix_leave_project_display' into 'master' | Stan Hu | 2015-12-22 | 2 | -9/+9 |
|\ \ | |||||
| * | | Fix and test leave project display | Drew Blessing | 2015-12-21 | 2 | -9/+9 |
* | | | Merge branch 'new-group-page' into 'master' | Dmitriy Zaporozhets | 2015-12-22 | 2 | -36/+46 |
|\ \ \ | |||||
| * | | | New UI for group pagenew-group-page | Dmitriy Zaporozhets | 2015-12-22 | 2 | -36/+46 |
| | |/ | |/| | |||||
* | | | Merge branch 'new-colors' into 'master' | Dmitriy Zaporozhets | 2015-12-22 | 4 | -19/+21 |
|\ \ \ | |/ / |/| | | |||||
| * | | New color for cover block background | Dmitriy Zaporozhets | 2015-12-22 | 1 | -1/+1 |
| * | | new colorsnew-colors | Andriy Dyadyura | 2015-12-21 | 1 | -1/+1 |
| * | | new-colors | Andriy Dyadyura | 2015-12-18 | 3 | -19/+21 |
* | | | Deprecate GitLabCiService making it to always be inactive | Kamil Trzcinski | 2015-12-22 | 1 | -1/+6 |
* | | | ci_build_details_path should return nil if builds_page result is nil | Kamil Trzcinski | 2015-12-22 | 1 | -0/+2 |
* | | | removes api credentials from link to build_page | Marvin Frick | 2015-12-22 | 1 | -1/+8 |
| |/ |/| | |||||
* | | Merge branch 'admin_add_identity' into 'master' | Robert Speicher | 2015-12-21 | 3 | -1/+21 |
|\ \ | |||||
| * | | Allow admin to create new user identities | Drew Blessing | 2015-12-15 | 3 | -1/+21 |
* | | | Merge branch 'fix-issue-related-mrs' into 'master' | Robert Speicher | 2015-12-21 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | Fix issue related cross-project MRsfix-issue-related-mrs | Douwe Maan | 2015-12-21 | 2 | -2/+2 |
* | | | | Merge branch 'add_email_unlock' into 'master' | Robert Speicher | 2015-12-21 | 5 | -19/+25 |
|\ \ \ \ | |||||
| * | | | | Allow account unlock via email | Drew Blessing | 2015-12-14 | 5 | -19/+25 |
* | | | | | Merge branch 'issue_3452' | Douwe Maan | 2015-12-21 | 2 | -0/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Add link to MR from Build detail page. #3452 | Rubén Dávila | 2015-12-16 | 2 | -0/+14 |
* | | | | | | Merge branch 'tduehr/gitlab-ce-cas-support' | Douwe Maan | 2015-12-21 | 2 | -1/+30 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add CAS authentication support | tduehr | 2015-12-14 | 2 | -1/+30 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'git-version' into 'master' | Douwe Maan | 2015-12-21 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Show git version on admin page | Trey Davis | 2015-12-15 | 1 | -0/+4 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'coverage-regex' into 'master' | Douwe Maan | 2015-12-21 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix build coverage regex. | Jared Szechy | 2015-12-20 | 1 | -1/+2 |
| * | | | | | | Fix build coverage regex matching to allow captures. | Jared Szechy | 2015-12-17 | 1 | -1/+1 |
* | | | | | | | Backport JIRA service | Drew Blessing | 2015-12-18 | 7 | -6/+266 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge branch 'ci-commit-status-skipped' into 'master' | Grzegorz Bizon | 2015-12-18 | 4 | -14/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the... | Kamil Trzcinski | 2015-12-17 | 4 | -14/+18 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'reference_clean_up' into 'master' | Robert Speicher | 2015-12-18 | 1 | -3/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Do not display project group/name when issue and MR are in same project | Drew Blessing | 2015-12-17 | 1 | -3/+4 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'remove-extra-spaces' into 'master' | Robert Speicher | 2015-12-18 | 1 | -8/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove extra spaces after branchname | Zeger-Jan van de Weg | 2015-12-18 | 1 | -8/+4 |
* | | | | | | | Merge branch 'fix/mr-reopen-button-title' into 'master' | Grzegorz Bizon | 2015-12-18 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Fix merge-request-reopen button titlefix/mr-reopen-button-title | Grzegorz Bizon | 2015-12-18 | 1 | -3/+3 |
| | |/ / / / | |/| | | | |