summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Reduce margin under projects filterDmitriy Zaporozhets2015-09-031-1/+1
* 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
| * | Decouple Gitlab::Markdown from the GitlabMarkdownHelperRobert Speicher2015-08-277-100/+111
* | | Merge branch 'fix-bitbucket-import-issue-order' into 'master'Douwe Maan2015-09-017-13/+90
|\ \ \
| * | | Fix bug where only the first 15 Bitbucket issues would be imported.Stan Hu2015-09-017-13/+89
| * | | Sort issues by creation date in Bitbucket importerStan Hu2015-09-012-1/+2
* | | | Merge branch 'gitlab-git-http-server' into 'master'Dmitriy Zaporozhets2015-09-0110-95/+299
|\ \ \ \
| * | | | Be more defensive when running 'kill'gitlab-git-http-serverJacob Vosmaer2015-08-311-1/+1
| * | | | Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-serverJacob Vosmaer2015-08-3137-129/+311
| |\ \ \ \
| * | | | | Replace grack with gitlab-git-http-serverJacob Vosmaer2015-08-3110-95/+299
* | | | | | Merge branch 'profile-settings' into 'master' Dmitriy Zaporozhets2015-09-013-25/+25
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Update db schemaDmitriy Zaporozhets2015-09-011-22/+22
| * | | | | Rename profile settings navigation to "Profile Settings"Dmitriy Zaporozhets2015-09-012-3/+3
|/ / / / /
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-09-011-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'master'Valery Sizov2015-09-011-1/+1
| |\ \ \ \ \
| | * | | | | Update Racc to 1.4.12Yorick Peterse2015-08-251-1/+1
* | | | | | | Merge branch 'add-commands' into 'master' Job van der Voort2015-09-011-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | deleted additional infokaren Carias2015-08-311-3/+0