summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* The good stuff needs NGINX 1.7.11nginx-git-httpJacob Vosmaer2015-09-072-6/+10
|
* Do not let NGINX buffer Git HTTP requestsJacob Vosmaer2015-09-072-0/+14
| | | | | | | | | | | | Before this change NGINX would convert a chunked HTTP POST (e.g. git push) into a HTTP 1.0 single large POST. This creates an unnecessary delay, and it creates unnecessary memory pressure on gitlab-git-http-server. For the response ('proxy_buffering') I am less sure that NGINX 's buffering behavior is harmful, but it still makes more sense to me not to interfere with gitlab-git-http-server (and the Golang net/http server).
* Merge branch 'annotate-models' into 'master'Dmitriy Zaporozhets2015-09-0716-138/+208
|\ | | | | | | | | | | Re-annotate models See merge request !1253
| * Re-annotate modelsStan Hu2015-09-0616-138/+208
| |
* | Merge branch 'url-builder-fix-for-relative-urls' into 'master'Dmitriy Zaporozhets2015-09-072-6/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix URL construction for merge requests, issues, notes, and commits for relative URL config This MR fixes the constructor of URL links for systems using relative URLs in the application config. The `host` parameter was used improperly, supplying an extra path (e.g. https://mydomain.com/gitlab) and unnecessary scheme. We should be able to default to the URL options set in `8_default_url_options.rb` file. Closes https://github.com/gitlabhq/gitlabhq/issues/9605 See merge request !1250
| * | Fix URL construction for merge requests, issues, notes, and commits for ↵Stan Hu2015-09-042-6/+3
| | | | | | | | | | | | | | | | | | relative URL config Closes https://github.com/gitlabhq/gitlabhq/issues/9605
* | | Merge branch 'fix-wiki-page-history' into 'master'Douwe Maan2015-09-079-40/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-019-40/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-072-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-042-0/+7
| | |_|/ | |/| | | | | | | | | | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466
* | | | Merge branch 'rs-highlight-new-notes' into 'master'Douwe Maan2015-09-072-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add syntax highlight scheme to notes rendered client-side See merge request !1249
| * | | | Add syntax highlight scheme to notes rendered client-siders-highlight-new-notesRobert Speicher2015-09-042-1/+5
| |/ / /
* | | | Merge branch 'upgrade-redis-required-check' into 'master'Marin Jankovski2015-09-071-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Redis requirement check to 2.4.0 per https://github.com/mperham/sidekiq/pull/957 Closes #2222 Closes #2445 See merge request !1251
| * | | | Upgrade Redis requirement check to 2.4.0 per ↵Stan Hu2015-09-061-4/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mperham/sidekiq/pull/957 Closes #2222 Closes #2445
* | | | Merge branch 'fix-extra-slash-in-gitlab-shell-doc' into 'master'Robert Schilling2015-09-061-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use File.join to prevent extra slash in help message from appearing. Before: ``` Try fixing it: sudo -u git -H /opt/gitlab/embedded/service/gitlab-shell//bin/create-hooks ``` See merge request !1252
| * | | Use File.join to prevent extra slash in help message from appearing. Before:Stan Hu2015-09-061-2/+2
|/ / / | | | | | | | | | | | | | | | | | | ``` Try fixing it: sudo -u git -H /opt/gitlab/embedded/service/gitlab-shell//bin/create-hooks ```
* | | 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-043-0/+17
|\ \ \ | | | | | | | | Add image content-type header in raw download
| * | | add Content-Type header of raw image filepilsner2015-09-043-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-09-0415-77/+56
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | UI improvements Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1245
| * | | Fix this crazy random failing testDmitriy Zaporozhets2015-09-042-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | 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>
| * | | Fix failing testDmitriy 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>
* | | Merge branch 'ui-improvements'Dmitriy Zaporozhets2015-09-0430-42/+162
|\ \ \
| * | | 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>
* | | Merge branch 'fix-services-doc-generation' into 'master'Douwe Maan2015-09-042-3/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Fix `rake services:doc` generation From: https://github.com/gitlabhq/gitlabhq/pull/9604#issuecomment-137539926 See merge request !1243
| * | Fix `rake services:doc` generationStan Hu2015-09-032-3/+9
|/ / | | | | | | [ci skip]
* | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-09-0322-35/+39
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ui improvements * show page context title instead of `Dashboard` keyword * fix event feed overflow * remove annoying tooltips where its not needed * fix tests broken in previous mr See merge request !1242
| * | Fix testsDmitriy Zaporozhets2015-09-031-1/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix testsDmitriy Zaporozhets2015-09-034-6/+6
| | | | | | | | | | | | 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>
* | 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
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collection of fixes and improvements to GitLab UI * new design colors * new font size * change padding and size of form inputs * new activity page * new groups page * new explore projects page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler See merge request !1239
| | * | 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>
View Lorry Controller Status