summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | New UI for explore groups and trending pagesDmitriy Zaporozhets2015-09-033-8/+6
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Style groups pageDmitriy Zaporozhets2015-09-033-5/+12
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Change some base colors in UIDmitriy Zaporozhets2015-09-0312-25/+30
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Increase use of variables in cssDmitriy Zaporozhets2015-09-036-6/+28
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Improve paddings and set new colors for linksDmitriy Zaporozhets2015-09-0310-22/+21
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Apply new font size and paddingDmitriy Zaporozhets2015-09-033-8/+10
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Redesign activity feed on dashboard and project pagesDmitriy Zaporozhets2015-09-0311-68/+70
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Reduce margin under projects filterDmitriy Zaporozhets2015-09-031-1/+1
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #9591 from bozaro/user-by-keyDouwe Maan2015-09-037-0/+112
|\ \ \ | |/ / |/| | Add API method for get user by ID of an SSH key
| * | 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
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Implement new design for projects page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #2413 See merge request !1236
| * | Fix home page for mobile devicesDmitriy Zaporozhets2015-09-025-2/+23
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Avoid horizontal scroll in sidebarDmitriy Zaporozhets2015-09-022-6/+16
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Keep header fluid for big resDmitriy Zaporozhets2015-09-022-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Collapse sidebar button at the bottomDmitriy Zaporozhets2015-09-022-8/+6
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix collapsed sidebarDmitriy Zaporozhets2015-09-022-3/+9
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Implement new design for projects pageDmitriy Zaporozhets2015-09-0211-59/+121
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'update-mailroom' into 'master'Robert Speicher2015-09-022-3/+6
|\ \ \ | |/ / |/| | | | | | | | | | | Update mail_room to 0.4.2 for better error handling See merge request !1234
| * | 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
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Split starred projects list and activity In same way like we did with your projects. For consistency Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1238
| * | Fix tests and update CHANGELOGrefactor-starred-projects-pageDmitriy Zaporozhets2015-09-022-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Split starred projects list and activity in same way like we did with your ↵Dmitriy Zaporozhets2015-09-024-19/+19
| | | | | | | | | | | | | | | | | | projects Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'grack-auth-new-instance' into 'master'Dmitriy Zaporozhets2015-09-022-1/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Avoid instance variable re-use trouble This is the quickest/dumbest/safest way I could think of to prevent the instance variable reuse problems we have on dev.gitlab.org now. See merge request !1237
| * | Avoid instance variable re-use troubleJacob Vosmaer2015-09-022-1/+9
| |/ | | | | | | | | This is the quickest/dumbest/safest way I could think of to prevent the instance variable reuse problems we have on dev.gitlab.org now.
* | Merge branch 'fix-raw-controller-disposition' into 'master'Dmitriy Zaporozhets2015-09-023-2/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the filename argument from Content-Disposition header This MR removes the filename argument from the `Content-Disposition` header to avoid RFC 5987 and RFC 6266 encoding issues. Some browsers (e.g. Internet Explorer) do not properly decode a Unicode string properly, and this can lead to odd filenames in the raw file download. This change allows the browser to determine the filename based on the URL. For example, if I have a file called `한글한글.pptx` and click to download it with the "Raw" button in the Files section, IE11 will ask: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/fdb688282c0d4564872deadb44c58b2c/image.png) If you look at the `Content-Disposition` field, you see this: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/2b342b83ae1ec61fd31937163ace8ec5/image.png) Chrome, Firefox, and Safari seem to be able to handle UTF-8 encoded filenames, even though this is not standard. See: http://greenbytes.de/tech/tc2231/ Closes https://github.com/gitlabhq/gitlabhq/issues/9595 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829 I've also submitted a pull request to Rails to support RFC 6266: https://github.com/rails/rails/pull/21461 See merge request !1235
| * | Remove the filename argument from Content-Disposition header to avoidStan Hu2015-09-023-2/+25
| |/ | | | | | | | | | | | | | | | | | | | | RFC 5987 and RFC 6266 encoding issues. This change allows the browser to determine the filename based on the URL. See: http://greenbytes.de/tech/tc2231/ Closes https://github.com/gitlabhq/gitlabhq/issues/9595 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829
* | Merge branch 'drone-ci' into 'master'Douwe Maan2015-09-0215-136/+1042
|\ \ | |/ |/| | | | | | | | | | | | | | | Drone CI service https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1184#note_1980652 /cc @DouweM See merge request !1215
| * Drone CI serviceKirilll Zaitsev2015-09-0215-136/+1042
|/
* Merge branch 'use_db_for_application_settings' into 'master'Marin Jankovski2015-09-012-2/+15
|\ | | | | | | | | | | | | | | Check if database connection exists when loading application settings !1217 broke omnibus-gitlab nightly builds. In omnibus-gitlab we precompile assets without a running database. See merge request !1230
| * 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
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Decouple Gitlab::Markdown from the GitlabMarkdownHelper This module is now the sole source of knowledge for *how* we render Markdown (and GFM). See merge request !1223
| * | 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
| | | | | | | | | | | | This adds some duplication, but this helper is temporary.
| * | Remove unnecessary `strip` from `reference_class` methodRobert Speicher2015-08-311-1/+1
| | |
| * | Move REDCARPET_OPTIONS to a private methodRobert Speicher2015-08-311-14/+16
| | | | | | | | | | | | | | | There wasn't really a reason to have them as a constant, and we were getting "already defined" warnings which are always annoying.
| * | 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
| | | | | | | | | | | | | | | Some usages of the `gfm` helper depend on the text not being rendered as standard Markdown. Ugh.
| * | Fix context options in `markdown` helperRobert Speicher2015-08-311-5/+5
| | | | | | | | | | | | We need to send `path`, not `requested_path`.
| * | 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
| | | | | | | | | | | | | | | Some views are still calling `gfm` directly. We'll need to update them to instead call `markdown` with a `pipeline: ...` argument.
| * | 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
| | | | | | | | | | | | | | | This module is now the sole source of knowledge for *how* we render Markdown (and GFM).
* | | Merge branch 'fix-bitbucket-import-issue-order' into 'master'Douwe Maan2015-09-017-13/+90
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import all Bitbucket issues and sort issues by creation date Previously only the first 15 Bitbucket issues would be imported. Other issues in the API return call also calls import errors. Tested by importing 400+ issues from this repo: https://bitbucket.org/ned/coveragepy API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518 Closes https://github.com/gitlabhq/gitlabhq/issues/9519 See merge request !1226
| * | | Fix bug where only the first 15 Bitbucket issues would be imported.Stan Hu2015-09-017-13/+89
| | | | | | | | | | | | | | | | Also fix a number of issues where author/reporter names were not available.
| * | | Sort issues by creation date in Bitbucket importerStan Hu2015-09-012-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518 Closes https://github.com/gitlabhq/gitlabhq/issues/9519
* | | | Merge branch 'gitlab-git-http-server' into 'master'Dmitriy Zaporozhets2015-09-0110-95/+299
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Replace grack with gitlab-git-http-server See merge request !1229
| * | | | Be more defensive when running 'kill'gitlab-git-http-serverJacob Vosmaer2015-08-311-1/+1
| | | | |
View Lorry Controller Status