summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'annotate-models' into 'master'Dmitriy Zaporozhets2015-09-077-69/+113
|\ | | | | | | | | | | Re-annotate models See merge request !1253
| * Re-annotate modelsStan Hu2015-09-067-69/+113
| |
* | Merge branch 'fix-wiki-page-history' into 'master'Douwe Maan2015-09-075-30/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken Wiki Page History This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes. Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399 See merge request !1232
| * | Fix broken Wiki Page HistoryStan Hu2015-09-015-30/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399
* | | Merge branch 'rs-dev-issue-2466' into 'master'Douwe Maan2015-09-071-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove style attribute from textarea during ZenMode activation Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466 Closes https://github.com/gitlabhq/gitlabhq/issues/8963 See merge request !1248
| * | | Remove style attribute from textarea during ZenMode activationrs-dev-issue-2466Robert Speicher2015-09-041-0/+2
| | |/ | |/| | | | | | | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466
* | | Add syntax highlight scheme to notes rendered client-siders-highlight-new-notesRobert Speicher2015-09-042-1/+5
|/ /
* | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-09-047-30/+62
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Style project home page Also make header more compact Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com See merge request !1246
| * | Make project page and header more compactDmitriy Zaporozhets2015-09-046-11/+16
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Make header and sidebar avatar more compactDmitriy Zaporozhets2015-09-043-8/+12
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Style project home pageDmitriy Zaporozhets2015-09-045-23/+46
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #9598 from darkrasid/masterStan Hu2015-09-041-0/+2
|\ \ \ | |/ / |/| | Add image content-type header in raw download
| * | add Content-Type header of raw image filepilsner2015-09-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add Content-Type header to fix a bug which IE can't show image in markdown when the image is from raw. modified: CHANGELOG modified: app/controllers/projects/raw_controller.rb modified: spec/controllers/projects/raw_controller_spec.rb
* | | REmove icons from milestone filtersDmitriy Zaporozhets2015-09-042-5/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Dont render merge request target branch in listDmitriy Zaporozhets2015-09-041-5/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Apply new style for issues, merge requests and milestone pagesDmitriy Zaporozhets2015-09-0410-53/+35
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Style dashboard milestones pageDmitriy Zaporozhets2015-09-042-13/+14
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix stars alignDmitriy Zaporozhets2015-09-041-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Small ui improvements to activity feedDmitriy Zaporozhets2015-09-044-9/+14
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix fonts for assetsDmitriy Zaporozhets2015-09-041-4/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Event feed use gl-padding varDmitriy Zaporozhets2015-09-041-2/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Make UI more compactDmitriy Zaporozhets2015-09-0416-42/+45
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Add awesome font SourceSansProDmitriy Zaporozhets2015-09-0414-0/+117
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix testsDmitriy Zaporozhets2015-09-032-3/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Set page title based on content in dashboard areaDmitriy Zaporozhets2015-09-0315-24/+30
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix even feed title overflowDmitriy Zaporozhets2015-09-031-2/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Replace obvious tooltips. Fix line-height for top navDmitriy Zaporozhets2015-09-032-2/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix tab toggle on activityDmitriy Zaporozhets2015-09-031-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Improve explore proojects pageDmitriy Zaporozhets2015-09-032-3/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Improve starred and trending pagesDmitriy Zaporozhets2015-09-036-25/+22
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Refactor colorsDmitriy Zaporozhets2015-09-037-14/+17
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | 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>
* | 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>
* | 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 'fix-raw-controller-disposition' into 'master'Dmitriy Zaporozhets2015-09-021-2/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-2/+1
| |/ | | | | | | | | | | | | | | | | | | | | 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
* | Drone CI serviceKirilll Zaitsev2015-09-025-5/+207
|/
* Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'Douwe Maan2015-09-011-26/+29
|\ | | | | | | | | | | | | | | | | 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
View Lorry Controller Status