summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make code clearerldap-attributesDouwe Maan2015-09-161-11/+9
|
* Add to changelogDouwe Maan2015-09-091-0/+1
|
* Add to docsDouwe Maan2015-09-092-2/+22
|
* Test overriding LDAP attributesDouwe Maan2015-09-091-0/+65
|
* Shuffle config around a bitDouwe Maan2015-09-093-15/+9
|
* Expand explanation in config fileDouwe Maan2015-09-091-15/+20
|
* Add attributes to LDAP::Config.Douwe Maan2015-09-084-4/+10
|
* Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan2015-09-086-15/+76
|
* Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-09-0727-116/+134
|\ | | | | | | | | | | | | | | | | | | | | Ui improvements * fix project home page when activity set as default * style commits, branches and tags pages to new style * render flash message outside of content block * style group pages See merge request !1255
| * Fix compare testsDmitriy Zaporozhets2015-09-071-1/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Restyle group pages. Merge header with page titleDmitriy Zaporozhets2015-09-077-42/+50
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Style project milestones pageDmitriy Zaporozhets2015-09-071-11/+14
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix testsDmitriy Zaporozhets2015-09-071-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Render flash message out of content blockDmitriy Zaporozhets2015-09-071-1/+1
| |
| * Style commits, branches and tags pages to match new UIDmitriy Zaporozhets2015-09-0714-56/+56
| |
| * Fix project page with activity as default home pageDmitriy Zaporozhets2015-09-073-3/+11
| |
* | Merge branch 'crowd' into 'master'Valery Sizov2015-09-0713-4/+126
|\ \ | | | | | | | | | | | | | | | | | | | | | Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228
| * | satisfy rubocopcrowdValery Sizov2015-09-073-22/+26
| | |
| * | added spinachValery Sizov2015-09-022-0/+26
| | |
| * | Crowd integrationValery Sizov2015-09-0211-4/+96
| | |
* | | 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>
View Lorry Controller Status