summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Hide search panel for group page if you dont have accesspublic_profilesDmitriy Zaporozhets2015-09-142-2/+6
|
* Fix tests and improve wordingDmitriy Zaporozhets2015-09-142-4/+3
|
* Hide group sidebar menu if user cant access itDmitriy Zaporozhets2015-09-141-29/+30
|
* Fix tests for group accessDmitriy Zaporozhets2015-09-141-6/+6
|
* Show activity/projects depends on accessDmitriy Zaporozhets2015-09-141-14/+18
|
* Allow access to group from root urlDmitriy Zaporozhets2015-09-141-1/+1
|
* Skip auth for group page but return auth for other group pagesDmitriy Zaporozhets2015-09-144-3/+7
|
* Make all group publicValery Sizov2015-09-0910-48/+51
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-09-084-5/+5
|\
| * Merge branch 'rs-bump-gitlab-shell' into 'master'Robert Speicher2015-09-084-5/+5
| |\ | | | | | | | | | | | | | | | | | | | | | Bump gitlab-shell to v2.6.5 [ci skip] See merge request !1264
| | * Bump gitlab-shell to v2.6.5Robert Speicher2015-09-084-5/+5
| |/
* | Merge pull request #9538 from szechyjs/feature/fogbugzStan Hu2015-09-0829-16/+889
|\ \ | |/ |/| Fogbugz importer
| * FogBugz project importJared Szechy2015-09-0829-16/+889
|/
* Improve diff UI and mr compare pageDmitriy Zaporozhets2015-09-086-17/+13
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Style merge request pageDmitriy Zaporozhets2015-09-083-11/+19
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Make system note different from regular commentsDmitriy Zaporozhets2015-09-082-1/+14
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve commit page styleDmitriy Zaporozhets2015-09-082-6/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix small font size for diff commentsDmitriy Zaporozhets2015-09-082-4/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-09-080-0/+0
|\
| * Merge branch 'issue-redesign' into 'master'Dmitriy Zaporozhets2015-09-0821-199/+175
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Issue redesign * new issue UI * fixed small font in issue/mr list See merge request !1258
* | | Move group member title to headerDmitriy Zaporozhets2015-09-081-3/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Make comment form biggerDmitriy Zaporozhets2015-09-081-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Style milestonesDmitriy Zaporozhets2015-09-085-48/+64
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Style wiki pagesDmitriy Zaporozhets2015-09-086-33/+35
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Style system notesDmitriy Zaporozhets2015-09-084-47/+16
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Improve issue/mr title and description stylesDmitriy Zaporozhets2015-09-083-8/+14
| |/ |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Improve font size on issues/mr listissue-redesignDmitriy Zaporozhets2015-09-084-5/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Style comment formDmitriy Zaporozhets2015-09-084-15/+10
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Style issue page, comments and part of merge request pageDmitriy Zaporozhets2015-09-0810-144/+96
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Small restyle of issue and merge request pagesDmitriy Zaporozhets2015-09-078-37/+68
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* 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
View Lorry Controller Status