summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* removes unused `alert` from issue spec. Requires flash in the ↵close-open-ajax-issueJacob Schatz2015-12-233-8/+3
| | | | *implementation* instead of the spec.
* adds test for issue close/reopen failureJacob Schatz2015-12-233-6/+63
|
* resolves conflicts with new buttonsJacob Schatz2015-12-23127-373/+3032
|\
| * Merge branch 'make-migrations-reversible' into 'master' Robert Speicher2015-12-237-5/+12
| |\ | | | | | | | | | | | | Make migrations reversible See merge request !2191
| | * Make migrations reversibleKamil Trzcinski2015-12-237-5/+12
| |/
| * Merge branch 'new-project-button-seperate-from-filter-name' into 'master' Dmitriy Zaporozhets2015-12-235-23/+64
| |\ | | | | | | | | | | | | | | | | | | | | | | | | New project button with filter in header. Fixes #3943 ![Screen_Shot_2015-12-21_at_3.47.01_PM](/uploads/f7f952440b4bb4b55f62241bbc328c95/Screen_Shot_2015-12-21_at_3.47.01_PM.png) See merge request !2165
| | * 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Button height old ![Screenshot_2015-12-23_15.48.12](/uploads/0e6c5696262475c197f8fcbf00199132/Screenshot_2015-12-23_15.48.12.png) new ![Screenshot_2015-12-23_15.48.45](/uploads/1d6bdf96f7c90b65f4a6b21df3951370/Screenshot_2015-12-23_15.48.45.png) also including MR page See merge request !2188
| | * | | 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 ↵Andriy Dyadyura2015-12-234-22/+11
| | |\ \ \ | | | | | | | | | | | | | | | | | | button-height
| | * \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Andriy Dyadyura2015-12-2330-171/+1541
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | button-height
| * | | | | Merge branch 'add-project-permissions' into 'master' Dmitriy Zaporozhets2015-12-234-3/+27
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project permissions to all project API endpoints This standardizes all the project API formats. Also needed to support Huboard. See merge request !2090
| | * | | | | Add project permissions to all project API endpointsStan Hu2015-12-224-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This standardizes all the project API formats. Also needed to support Huboard.
| * | | | | | Merge branch 'double-border-on-no-comments' into 'master' Dmitriy Zaporozhets2015-12-232-2/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | border bottom for last comment fixes double line issue Since image uploading isn't working atm. Will upload screenshots when it works again. https://unsee.cc/mosapine/ Fixes #3955 See merge request !2175
| | * | | | | 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
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New buttons OLD ![Screenshot_2015-12-22_21.42.59](/uploads/79e85727586f7b917b8ab9ef867e79dc/Screenshot_2015-12-22_21.42.59.png) NEW ![Screenshot_2015-12-22_21.42.21](/uploads/aee54160f17e0502e14ca5c754dcfe50/Screenshot_2015-12-22_21.42.21.png) See merge request !2179
| | * | | | | Fix close/reopen buttonsnew-buttonsDmitriy Zaporozhets2015-12-234-22/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix method that ensures authentication token Until now, `ensure_#{token_filed_name}!` method didn't persist new token in database. This closes #4235. See merge request !2185
| | * | | | | | Use method that creates runners registration tokenGrzegorz Bizon2015-12-236-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `runners_registration_token` now creates a new token if it is blank.
| | * | | | | | 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
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, `ensure_#{token_filed_name}` method didn't persist new token in database. This closes #4235.
| * | | | | | Merge branch 'rs-update-jquery' into 'master' Dmitriy Zaporozhets2015-12-234-11/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0 Closes #2859 See merge request !2183
| | * | | | | | 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. I'm hunting for this link from time to time in customer demo's so I think it is useful to add. /cc @ayufan See merge request !1993
| | * | | | | 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.0 Addressing gitlab-org/gitlab-ce#2857 See merge request !2184
| | * | | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve emoji picker This request uses an emoji image sprite to show big set of emojis. The sprite has been made based one gemojione gem images. The categories are retrieved from https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json as well. Some categories are pretty poor, it can be extended in the future. It's a first step on the way to improve picker. The first implementation was using https://github.com/iamcal/emoji-data project, but there was huge incompatibility with gemojione emojis set and I had to drop that solution. ![Screenshot_2015-12-22_23.26.27](/uploads/7d323eb0586204ac92915b41233b97ec/Screenshot_2015-12-22_23.26.27.png) See merge request !2172
| | * | | | | | 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 synchronous This removes `remote: true` from CI Lint form, making it synchronous form. This also removes some complexity related to displaying lint messages. View also has been updated, removed deprecated Bootstrap 2 tags. Improved design. See merge request !2171
| | * | | | | Make CI Lint form synchronousfix/ci-lintGrzegorz Bizon2015-12-225-29/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes `remote: true` from CI Lint form, making it synchronous form. This also removes some complexity related to displaying lint messages. View also has been updated, removed deprecated Bootstrap 2 tags. Improved design. Closes #4206
View Lorry Controller Status