Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-07 | 13 | -62/+85 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-07 | 12 | -61/+84 |
| |\ | |||||
| | * | Use better_errors editor links in sherlock18254-use-better_errors-editor-links-in-sherlock | Alejandro RodrÃguez | 2016-06-06 | 2 | -3/+11 |
| | * | Merge branch 'wiki-bottom-padding' into 'master' | Jacob Schatz | 2016-06-06 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Add padding to bottom of wiki page, fix #12921. | Connor Shea | 2016-06-06 | 1 | -1/+1 |
| | * | | Merge branch 'activity-links' into 'master' | Jacob Schatz | 2016-06-06 | 1 | -3/+7 |
| | |\ \ | |||||
| | | * | | Fixed issue with activity links not being consistentactivity-links | Phil Hughes | 2016-06-02 | 1 | -3/+7 |
| | * | | | Merge branch 'edit-mobile' into 'master' | Jacob Schatz | 2016-06-06 | 3 | -9/+26 |
| | |\ \ \ | |||||
| | | * | | | Shows the edit comment button on mobileedit-mobile | Phil Hughes | 2016-06-02 | 3 | -9/+26 |
| | | |/ / | |||||
| | * | | | Merge branch '18026-consider-removing-issue-merge-request-previous-next-butto... | Jacob Schatz | 2016-06-06 | 3 | -45/+0 |
| | |\ \ \ | |||||
| | | * | | | Remove prev/next buttons on issues and merge requests18026-consider-removing-issue-merge-request-previous-next-buttons | Alejandro RodrÃguez | 2016-06-06 | 3 | -45/+0 |
| | * | | | | Merge branch 'confidential-issue-notice' into 'master' | Jacob Schatz | 2016-06-06 | 2 | -0/+39 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | Fix error on non-issue pages with comment areas. | Connor Shea | 2016-06-05 | 1 | -1/+1 |
| | | * | | | Add confidential issue notice in comment box. | Connor Shea | 2016-06-03 | 2 | -0/+39 |
| * | | | | | Fix tests failures | Kamil Trzcinski | 2016-06-07 | 1 | -1/+1 |
* | | | | | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-06 | 17 | -129/+237 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 13 | -123/+230 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch 'notes-are-awardables' into 'master' | Douwe Maan | 2016-06-06 | 13 | -123/+230 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | Updated MR notes.notes-are-awardables | Fatih Acet | 2016-06-06 | 4 | -18/+16 |
| | | * | | | Fix scss-lint. | Fatih Acet | 2016-06-06 | 1 | -1/+1 |
| | | * | | | Added tests for award emoji feature. | Fatih Acet | 2016-06-06 | 2 | -11/+11 |
| | | * | | | Create and show emoji loader on the fly. | Fatih Acet | 2016-06-06 | 2 | -6/+21 |
| | | * | | | Some design related tweaks. | Fatih Acet | 2016-06-06 | 6 | -7/+24 |
| | | * | | | Be consistent on naming. | Fatih Acet | 2016-06-06 | 1 | -22/+22 |
| | | * | | | Animate emoji when rendered. | Fatih Acet | 2016-06-06 | 1 | -1/+12 |
| | | * | | | Fix mutual exclusivity for emoji only comments. | Fatih Acet | 2016-06-06 | 1 | -1/+4 |
| | | * | | | Refactor awardsHandler methods to work with votesBlock. | Fatih Acet | 2016-06-06 | 2 | -35/+36 |
| | | * | | | Award emoji implementation for notes. | Fatih Acet | 2016-06-06 | 3 | -65/+92 |
| | | * | | | Show emoji menu in notes. | Fatih Acet | 2016-06-06 | 3 | -3/+25 |
| | | * | | | Backend awardables on comments | ZJ van de Weg | 2016-06-06 | 4 | -2/+15 |
| * | | | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 4 | -6/+7 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/master' into rename-ci-commit | Kamil Trzcinski | 2016-06-06 | 4 | -6/+7 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge branch 'jquery2' into 'master' | Jacob Schatz | 2016-06-06 | 4 | -6/+7 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fixed JS errorsjquery2 | Phil Hughes | 2016-06-05 | 3 | -5/+6 |
| | | | * | | | | Upgraded jQuery to version 2 | Phil Hughes | 2016-06-05 | 1 | -1/+1 |
| | | | |/ / / | |||||
* | | | | | | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-06 | 27 | -112/+520 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 27 | -112/+520 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Use `@ci_commit` in merge_request_controller | Kamil Trzcinski | 2016-06-06 | 1 | -4/+4 |
| | * | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit | Kamil Trzcinski | 2016-06-06 | 26 | -108/+516 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2016-06-06 | 24 | -106/+514 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Add a U2F-specific audit log entry after logging in. | Timothy Andrew | 2016-06-06 | 1 | -2/+11 |
| | | | * | | | | Implement authentication (login) using a U2F device. | Timothy Andrew | 2016-06-06 | 5 | -30/+164 |
| | | | * | | | | Implement U2F registration. | Timothy Andrew | 2016-06-06 | 10 | -57/+256 |
| | | | * | | | | Render `gon` data in the page `body`, not `head` | Timothy Andrew | 2016-06-06 | 5 | -2/+5 |
| | | | * | | | | Update the `browser` gem. | Timothy Andrew | 2016-06-06 | 1 | -1/+1 |
| | | | * | | | | Add a `U2fRegistrations` table/model. | Timothy Andrew | 2016-06-06 | 4 | -14/+77 |
| | | | |/ / / | |||||
| | | * | | | | Merge branch 'fix/unauthorized-access-to-build-data' into 'master' | Douwe Maan | 2016-06-06 | 2 | -2/+2 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | | * | | | Remove 'unscoped' from project builds selection | Tomasz Maczukin | 2016-06-04 | 2 | -2/+2 |
| | | | |/ / | |||||
* | | | | | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-06 | 58 | -414/+819 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 58 | -415/+820 |
| |\ \ \ \ \ | | |/ / / / |