summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump underscore-rails to ~> 1.8.0rs-bump-underscore-railsRobert Speicher2015-12-232-3/+3
* Merge branch 'new-project-button-seperate-from-filter-name' into 'master' Dmitriy Zaporozhets2015-12-235-23/+64
|\
| * fixes spacing between new project button and inputnew-project-button-seperate-from-filter-nameJacob Schatz2015-12-231-1/+1
| * moves border bottom to `left-menu-top` class.Jacob Schatz2015-12-231-2/+2
| * fixing conflict.Jacob Schatz2015-12-231-1/+1
| |\
| | * project headerJacob Schatz2015-12-214-22/+52
| * | adds css for `left-top-menu`. Also hides buttons in certain for factors.Jacob Schatz2015-12-234-6/+17
| * | project headerJacob Schatz2015-12-234-22/+52
* | | Merge branch 'button-height' into 'master' Dmitriy Zaporozhets2015-12-237-15/+15
|\ \ \
| * | | new button sizesAndriy Dyadyura2015-12-231-1/+1
| * | | new button sizesAndriy Dyadyura2015-12-237-15/+15
| * | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into button-...Andriy Dyadyura2015-12-234-22/+11
| |\ \ \
| * \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into button-...Andriy Dyadyura2015-12-2330-171/+1541
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge branch 'add-project-permissions' into 'master' Dmitriy Zaporozhets2015-12-234-3/+27
|\ \ \ \ \
| * | | | | Add project permissions to all project API endpointsStan Hu2015-12-224-3/+27
* | | | | | Merge branch 'double-border-on-no-comments' into 'master' Dmitriy Zaporozhets2015-12-232-2/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | border bottom for last comment fixes double line issuedouble-border-on-no-commentsJacob Schatz2015-12-222-2/+1
* | | | | | Merge branch 'new-buttons' into 'master' Dmitriy Zaporozhets2015-12-234-23/+26
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix close/reopen buttonsnew-buttonsDmitriy Zaporozhets2015-12-234-22/+11
| * | | | | Merge branch 'master' into new-buttonsDmitriy Zaporozhets2015-12-2320-143/+1491
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | buttons colors updateAndriy Dyadyura2015-12-222-1/+12
| * | | | | new buttons issueAndriy Dyadyura2015-12-223-5/+5
| * | | | | new buttons issueAndriy Dyadyura2015-12-221-4/+4
| * | | | | new buttonsAndriy Dyadyura2015-12-221-6/+9
* | | | | | Merge branch 'fix/ci-runners-token-persistence' into 'master' Grzegorz Bizon2015-12-237-17/+37
|\ \ \ \ \ \
| * | | | | | Use method that creates runners registration tokenGrzegorz Bizon2015-12-236-5/+7
| * | | | | | Add method that persist ensured token in `TokenAuthenticatable`Grzegorz Bizon2015-12-232-8/+26
| * | | | | | Fix method that ensures authentication tokenGrzegorz Bizon2015-12-232-6/+6
| |/ / / / /
* | | | | | Merge branch 'rs-update-jquery' into 'master' Dmitriy Zaporozhets2015-12-234-11/+12
|\ \ \ \ \ \
| * | | | | | Fix paths for jquery-ui assetsrs-update-jqueryRobert Speicher2015-12-222-4/+4
| * | | | | | Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0Robert Speicher2015-12-222-7/+8
| |/ / / / /
* | | | | | Merge branch 'meta-example' into 'master' Sytse Sijbrandij2015-12-231-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Link to the gitlab-ci.yml file of GitLab itself.meta-exampleSytse Sijbrandij2015-12-051-0/+1
* | | | | | Merge branch 'rs-update-sass-rails' into 'master' Dmitriy Zaporozhets2015-12-232-7/+8
|\ \ \ \ \ \
| * | | | | | Bump sass-rails to ~> 5.0.0rs-update-sass-railsRobert Speicher2015-12-222-7/+8
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'improve_emoji_picker' into 'master' Dmitriy Zaporozhets2015-12-2312-80/+1428
|\ \ \ \ \ \
| * | | | | | improved emoji picker styleimprove_emoji_pickerValery Sizov2015-12-222-2/+4
| * | | | | | TYPO in the commentValery Sizov2015-12-221-1/+1
| * | | | | | customize niceScrollValery Sizov2015-12-221-1/+1
| * | | | | | add some spinachValery Sizov2015-12-222-0/+12
| * | | | | | fix specsValery Sizov2015-12-223-10/+6
| * | | | | | emoji picker: minor fixesValery Sizov2015-12-221-8/+0
| * | | | | | emoji css refactoringValery Sizov2015-12-221-1262/+1267
| * | | | | | base implementation of emoji picker [ci skip]Valery Sizov2015-12-2210-71/+1412
| |/ / / / /
* | | | | | Merge branch 'fix/ci-lint' into 'master' Grzegorz Bizon2015-12-236-56/+55
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Make CI Lint form synchronousfix/ci-lintGrzegorz Bizon2015-12-225-29/+17
| * | | | | Rename CI lint specs fileGrzegorz Bizon2015-12-221-0/+0
| * | | | | Improve CI Lint specs (refactoring)Grzegorz Bizon2015-12-221-18/+29
* | | | | | Merge branch 'fix_leave_project_display' into 'master' Stan Hu2015-12-224-9/+33
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix and test leave project displayDrew Blessing2015-12-214-9/+33
| | |_|_|/ | |/| | |