summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix close/reopen buttonsnew-buttonsDmitriy Zaporozhets2015-12-234-22/+11
* 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.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
* | | 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 displayDrew Blessing2015-12-214-9/+33
* | | Merge branch 'new-group-page' into 'master' Dmitriy Zaporozhets2015-12-224-37/+48
|\ \ \
| * | | New UI for group pagenew-group-pageDmitriy Zaporozhets2015-12-223-36/+47
| * | | Bump versionDmitriy Zaporozhets2015-12-221-1/+1
| | |/ | |/|
* | | Merge branch 'hotfix/sidekiq-cron-config' into 'master' Douwe Maan2015-12-222-2/+6
|\ \ \
| * | | 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 color for cover block backgroundDmitriy Zaporozhets2015-12-221-1/+1
| * | | 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.ymlfeature/sidekiq-cron-configGabriel Mazetto2015-12-144-15/+20
* | | | Merge branch 'fix-mr-500' into 'master' Robert Speicher2015-12-224-2/+38
|\ \ \ \
| * | | | Move `ci_build_details_path` helper spec to correct locationRobert Speicher2015-12-212-22/+20
| * | | | 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
| * | | | removes api credentials from link to build_pageMarvin Frick2015-12-222-1/+30
* | | | | Merge branch 'rs-bump-nokogiri' into 'master' Robert Speicher2015-12-222-1/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Explicitly require Nokogiri 1.6.7.1 due to security issuers-bump-nokogiriRobert Speicher2015-12-182-1/+5
* | | | | Add 8.4.0 to CHANGELOGRobert Speicher2015-12-211-2/+3
* | | | | Merge branch 'contributing-grabs-fix' into 'master' Robert Speicher2015-12-211-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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 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 MRsfix-issue-related-mrsDouwe Maan2015-12-212-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'add_email_unlock' into 'master' Robert Speicher2015-12-2110-21/+35
|\ \ \ \ \ \