be59f4338f
Fix RootController
2015-09-09 09:25:49 +01:00
f87f6480b2
Use new routing helper
2015-09-08 17:53:16 +01:00
1489d225d6
Move partial to right place and fix tests.
2015-09-08 15:14:14 +01:00
5d785457db
Clean up overlap between dashboard and explore.
...
- Split up SnippetsController into separate dashboard and explore sections.
- Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
2015-09-08 14:49:20 +01:00
260fcd4520
Consistently case `Back to X` links.
2015-09-08 14:43:41 +01:00
d92696d39d
Link to help from signin page bottom.
2015-09-08 14:42:39 +01:00
c258e97747
Make Help accessible for guests.
2015-09-08 14:42:30 +01:00
e0da2c3523
Merge branch 'ui-improvements' into 'master'
...
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
2015-09-07 14:17:00 +00:00
2b31989582
Fix compare tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-07 14:55:42 +02:00
954dd7ce87
Merge branch 'crowd' into 'master'
...
Crowd integration
https://dev.gitlab.org/gitlab/gitlabhq/issues/2217
See merge request !1228
2015-09-07 11:20:03 +00:00
700a342e0d
Restyle group pages. Merge header with page title
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-07 13:18:11 +02:00
dad163b7ee
Style project milestones page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-07 12:52:53 +02:00
183562bc35
Fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-07 12:45:06 +02:00
9836017c70
satisfy rubocop
2015-09-07 13:15:27 +03:00
0fbd6244ec
Merge branch 'annotate-models' into 'master'
...
Re-annotate models
See merge request !1253
2015-09-07 09:58:51 +00:00
11f815ac1e
Render flash message out of content block
2015-09-07 11:58:19 +02:00
14805d6f5c
Merge branch 'url-builder-fix-for-relative-urls' into 'master'
...
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
2015-09-07 09:57:05 +00:00
aa6d29f0a7
Style commits, branches and tags pages to match new UI
2015-09-07 11:44:00 +02:00
662cf2cef4
Merge branch 'fix-wiki-page-history' into 'master'
...
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
2015-09-07 09:27:48 +00:00
b9df499860
Merge branch 'rs-dev-issue-2466' into 'master'
...
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
2015-09-07 09:20:00 +00:00
6c1d5c5c9c
Fix project page with activity as default home page
2015-09-07 11:10:40 +02:00
af35fc8c25
Merge branch 'rs-highlight-new-notes' into 'master'
...
Add syntax highlight scheme to notes rendered client-side
See merge request !1249
2015-09-07 09:09:37 +00:00
8bd419d9c8
Merge branch 'upgrade-redis-required-check' into 'master'
...
Upgrade Redis requirement check to 2.4.0 per https://github.com/mperham/sidekiq/pull/957
Closes #2222
Closes #2445
See merge request !1251
2015-09-07 07:39:58 +00:00
66eca7d3ba
Merge branch 'fix-extra-slash-in-gitlab-shell-doc' into 'master'
...
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
2015-09-06 15:41:19 +00:00
d7812a95cf
Re-annotate models
2015-09-06 07:48:48 -07:00
fd6eba34eb
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
```
2015-09-06 07:41:23 -07:00
30039dae63
Upgrade Redis requirement check to 2.4.0 per https://github.com/mperham/sidekiq/pull/957
...
Closes #2222
Closes #2445
2015-09-06 00:35:16 -07:00
a5314e79f2
Fix URL construction for merge requests, issues, notes, and commits for relative URL config
...
Closes https://github.com/gitlabhq/gitlabhq/issues/9605
2015-09-04 16:24:01 -07:00
38f1d571fe
Remove style attribute from textarea during ZenMode activation
...
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466
2015-09-04 18:01:36 -04:00
cc22a2640f
Add syntax highlight scheme to notes rendered client-side
2015-09-04 17:07:24 -04:00
50f76ae0ea
Merge branch 'ui-improvements' into 'master'
...
Style project home page
Also make header more compact
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com
See merge request !1246
2015-09-04 20:22:36 +00:00
9793c3460f
Make project page and header more compact
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 21:36:56 +02:00
ac6dfbd91c
Make header and sidebar avatar more compact
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 21:21:31 +02:00
e8bbc83771
Merge pull request #9598 from darkrasid/master
...
Add image content-type header in raw download
2015-09-04 07:49:01 -07:00
670544c8fa
Style project home page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 16:14:16 +02:00
69beca5ae9
Merge branch 'ui-improvements' into 'master'
...
UI improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1245
2015-09-04 14:13:53 +00:00
aa75e76a0a
Fix this crazy random failing test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 15:36:25 +02:00
bc6706fd6a
REmove icons from milestone filters
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 15:28:04 +02:00
43394f0a30
Dont render merge request target branch in list
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 15:23:21 +02:00
147f95b753
Apply new style for issues, merge requests and milestone pages
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 15:22:33 +02:00
cf36509a34
Style dashboard milestones page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 15:00:50 +02:00
0362a0f0d7
Fix stars align
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 14:57:11 +02:00
8b5a14fd0a
Fix failing test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 14:53:25 +02:00
8301836b42
Small ui improvements to activity feed
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 11:56:32 +02:00
af6f739f35
Fix fonts for assets
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 11:40:15 +02:00
dc86a91979
Event feed use gl-padding var
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 11:31:48 +02:00
20647f0306
Merge branch 'ui-improvements'
2015-09-04 11:27:49 +02:00
c13ef89862
Make UI more compact
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 11:17:25 +02:00
16e6913e00
Add awesome font SourceSansPro
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04 11:17:07 +02:00
f92b1cb0ff
Merge branch 'fix-services-doc-generation' into 'master'
...
Fix `rake services:doc` generation
From: https://github.com/gitlabhq/gitlabhq/pull/9604#issuecomment-137539926
See merge request !1243
2015-09-04 08:18:00 +00:00
Douwe Maan
Dmitriy Zaporozhets
Valery Sizov
Valery Sizov
Marin Jankovski
Robert Schilling
Stan Hu
Robert Speicher