summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * 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
| | * Rename CI lint specs fileGrzegorz Bizon2015-12-221-0/+0
| | |
| | * Improve CI Lint specs (refactoring)Grzegorz Bizon2015-12-221-18/+29
| | |
* | | 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_leave_project_display' into 'master' Stan Hu2015-12-224-9/+33
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix and test leave project display The 'Leave this project' display on project page was broken. It was calling the method incorrectly, which returned `nil` and displayed nothing. This fixes the display and also adds 2 different tests for it. cc/ @jvanbaarsen @stanhu Please review and merge if you think it looks good. Thank you! See merge request !2166
| * | Fix and test leave project displayDrew Blessing2015-12-214-9/+33
| | |
* | | Merge branch 'new-group-page' into 'master' Dmitriy Zaporozhets2015-12-224-37/+48
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New group page Implementing from https://gitlab.com/gitlab-org/gitlab-ce/issues/3480#note_2722988 cc @skyruler For https://gitlab.com/gitlab-org/gitlab-ce/issues/3480 See merge request !2174
| * | | New UI for group pagenew-group-pageDmitriy Zaporozhets2015-12-223-36/+47
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Bump versionDmitriy Zaporozhets2015-12-221-1/+1
| | |/ | |/| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'hotfix/sidekiq-cron-config' into 'master' Douwe Maan2015-12-222-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Hotfix for sidekiq-cron being loaded from Settingslogic with defaults This fixes a regression with "Stack level too deep" from master. See merge request !2173
| * | | Hotfix for sidekiq-cron being loaded from Settingslogic with defaultsGabriel Mazetto2015-12-222-2/+6
|/ / /
* | | Merge branch 'new-colors' into 'master' Dmitriy Zaporozhets2015-12-224-19/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New colour scheme old ![Screenshot_2015-12-17_14.14.53](/uploads/5d6ac28b6d99186485d727a72cc8a662/Screenshot_2015-12-17_14.14.53.png) new ![Screenshot_2015-12-17_14.15.07](/uploads/06e07fa3716aa8664b1507b390270285/Screenshot_2015-12-17_14.15.07.png) * Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2577 See merge request !2151
| * | | New color for cover block backgroundDmitriy Zaporozhets2015-12-221-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | new colorsnew-colorsAndriy Dyadyura2015-12-211-1/+1
| | | |
| * | | new-colorsAndriy Dyadyura2015-12-183-19/+21
| | | |
* | | | Merge branch 'feature/sidekiq-cron-config' into 'master' Dmitriy Zaporozhets2015-12-224-15/+20
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sidekiq-cron configuration moved to gitlab.yml When `sidekiq-cron` was introduced, jobs configuration where placed in `schedule.yml` file. As discussed in #3928, this is not desirable. We moved it to `gitlab.yml`, exposing only the "cron" part of the configuration. See merge request !2087
| * | | Sidekiq-cron configuration moved to gitlab.ymlfeature/sidekiq-cron-configGabriel Mazetto2015-12-144-15/+20
| | | |
* | | | Merge branch 'fix-mr-500' into 'master' Robert Speicher2015-12-224-2/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR 500 when viewing the MR page Fixes #2712 See merge request !2167
| * | | | Move `ci_build_details_path` helper spec to correct locationRobert Speicher2015-12-212-22/+20
| | | | | | | | | | | | | | | | | | | | Also, make it not fail.
| * | | | Update CHANGELOGfix-mr-500Kamil Trzcinski2015-12-221-0/+2
| | | | |
| * | | | Deprecate GitLabCiService making it to always be inactiveKamil Trzcinski2015-12-221-1/+6
| | | | |
| * | | | ci_build_details_path should return nil if builds_page result is nilKamil Trzcinski2015-12-221-0/+2
| | | | | | | | | | | | | | | | | | | | This is required since we parse URI later and remove the credentials
| * | | | removes api credentials from link to build_pageMarvin Frick2015-12-222-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | Also adds a spec for MergeRequestHelper to avoid having a regression later on.
* | | | | Merge branch 'rs-bump-nokogiri' into 'master' Robert Speicher2015-12-222-1/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly require Nokogiri 1.6.7.1 due to security issue ``` Name: nokogiri Version: 1.6.7 Advisory: CVE-2015-5312 Criticality: High URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s Title: Nokogiri gem contains several vulnerabilities in libxml2 Solution: upgrade to >= 1.6.7.1 ``` See merge request !2154
| * | | | Explicitly require Nokogiri 1.6.7.1 due to security issuers-bump-nokogiriRobert Speicher2015-12-182-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Name: nokogiri Version: 1.6.7 Advisory: CVE-2015-5312 Criticality: High URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s Title: Nokogiri gem contains several vulnerabilities in libxml2 Solution: upgrade to >= 1.6.7.1
* | | | | Add 8.4.0 to CHANGELOGRobert Speicher2015-12-211-2/+3
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'contributing-grabs-fix' into 'master' Robert Speicher2015-12-211-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Fixed wrong URL to "up for grabs" issue filter [ci skip] See merge request !2162
| * | | | Fixed wrong URL to "up for grabs" issue filterLaurens Stötzel2015-12-211-1/+1
| | | | |
* | | | | Merge branch 'admin_add_identity' into 'master' Robert Speicher2015-12-214-2/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow admin to create new user identities Fixes #2442 See merge request !2077
| * | | | | Allow admin to create new user identitiesDrew Blessing2015-12-154-2/+22
| | | | | |
* | | | | | Merge branch 'fix-issue-related-mrs' into 'master' Robert Speicher2015-12-212-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue related cross-project MRs Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4188 See merge request !2163
| * | | | | | Fix issue related cross-project MRsfix-issue-related-mrsDouwe Maan2015-12-212-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'add_email_unlock' into 'master' Robert Speicher2015-12-2110-21/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow account unlock via email We see a lot of users get confused about what it means when your account gets locked. Many try to reset their password and are still faced with a lockout. With this change, users receive an email that allows them to unlock their account immediately. The previous behavior where the account is auto-unlocked after a time also still works. See merge request !2049
View Lorry Controller Status