summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix tab toggle on activityDmitriy Zaporozhets2015-09-031-1/+1
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-09-0337-174/+208
|\
| * Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-09-0337-174/+208
| |\
| | * Improve explore proojects pageDmitriy Zaporozhets2015-09-032-3/+2
| | * Improve starred and trending pagesDmitriy Zaporozhets2015-09-036-25/+22
| | * Refactor colorsDmitriy Zaporozhets2015-09-037-14/+17
| | * New UI for explore groups and trending pagesDmitriy Zaporozhets2015-09-033-8/+6
| | * Style groups pageDmitriy Zaporozhets2015-09-033-5/+12
| | * Change some base colors in UIDmitriy Zaporozhets2015-09-0312-25/+30
| | * Increase use of variables in cssDmitriy Zaporozhets2015-09-036-6/+28
| | * Improve paddings and set new colors for linksDmitriy Zaporozhets2015-09-0310-22/+21
| | * Apply new font size and paddingDmitriy Zaporozhets2015-09-033-8/+10
| | * Redesign activity feed on dashboard and project pagesDmitriy Zaporozhets2015-09-0311-68/+70
| | * Reduce margin under projects filterDmitriy Zaporozhets2015-09-031-1/+1
| |/
* | Merge pull request #9591 from bozaro/user-by-keyDouwe Maan2015-09-037-0/+112
|\ \ | |/ |/|
| * Move get user by ID of an SSH key documentation to separate fileArtem V. Navrotskiy2015-09-033-45/+47
| * Add API method for get user by ID of an SSH keyArtem V. Navrotskiy2015-09-036-0/+110
* | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-09-0315-69/+166
|\ \ | |/ |/|
| * Fix home page for mobile devicesDmitriy Zaporozhets2015-09-025-2/+23
| * Avoid horizontal scroll in sidebarDmitriy Zaporozhets2015-09-022-6/+16
| * Keep header fluid for big resDmitriy Zaporozhets2015-09-022-2/+2
| * Collapse sidebar button at the bottomDmitriy Zaporozhets2015-09-022-8/+6
| * Fix collapsed sidebarDmitriy Zaporozhets2015-09-022-3/+9
| * Implement new design for projects pageDmitriy Zaporozhets2015-09-0211-59/+121
* | Merge branch 'update-mailroom' into 'master'Robert Speicher2015-09-022-3/+6
|\ \ | |/ |/|
| * Update mail_room to 0.4.2 for better error handlingDouwe Maan2015-09-022-3/+6
* | Merge branch 'refactor-starred-projects-page' into 'master'Dmitriy Zaporozhets2015-09-026-21/+21
|\ \
| * | Fix tests and update CHANGELOGrefactor-starred-projects-pageDmitriy Zaporozhets2015-09-022-2/+2
| * | Split starred projects list and activity in same way like we did with your pr...Dmitriy Zaporozhets2015-09-024-19/+19
* | | Merge branch 'grack-auth-new-instance' into 'master'Dmitriy Zaporozhets2015-09-022-1/+9
|\ \ \ | |/ / |/| |
| * | Avoid instance variable re-use troubleJacob Vosmaer2015-09-022-1/+9
| |/
* | Merge branch 'fix-raw-controller-disposition' into 'master'Dmitriy Zaporozhets2015-09-023-2/+25
|\ \
| * | Remove the filename argument from Content-Disposition header to avoidStan Hu2015-09-023-2/+25
| |/
* | Merge branch 'drone-ci' into 'master'Douwe Maan2015-09-0215-136/+1042
|\ \ | |/ |/|
| * Drone CI serviceKirilll Zaitsev2015-09-0215-136/+1042
|/
* Merge branch 'use_db_for_application_settings' into 'master'Marin Jankovski2015-09-012-2/+15
|\
| * Added USE_DB env var to allow loading fake settings without db running.use_db_for_application_settingsMarin Jankovski2015-09-012-2/+15
* | Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'Douwe Maan2015-09-0133-140/+162
|\ \
| * | Remove PreferencesHelper include from GitlabMarkdownHelperrs-cleanup-redcarpet-rendererRobert Speicher2015-09-011-2/+0
| * | Require gitlab/markdown in ReferenceExtractorRobert Speicher2015-09-011-0/+2
| * | Make sure the `gfm` helper passes the required optionsRobert Speicher2015-08-312-2/+10
| * | Remove unnecessary `strip` from `reference_class` methodRobert Speicher2015-08-311-1/+1
| * | Move REDCARPET_OPTIONS to a private methodRobert Speicher2015-08-311-14/+16
| * | Remove invalid spec for GitlabMarkdownHelperRobert Speicher2015-08-311-5/+0
| * | Make `gfm` delegate to `Gitlab::Markdown.gfm` instead of `markdown`Robert Speicher2015-08-311-1/+1
| * | Fix context options in `markdown` helperRobert Speicher2015-08-311-5/+5
| * | Make sure the main Gitlab::Markdown module gets loaded before filtersRobert Speicher2015-08-2718-1/+28
| * | Add a temporary `gfm` helper that just delegates to `markdown`Robert Speicher2015-08-271-0/+6
| * | Reference filters no longer take a custom class context optionRobert Speicher2015-08-2710-43/+1
| * | Restore the forwarded HTML options in link_to_gfmRobert Speicher2015-08-272-0/+15