Commit Graph
5156 Commits
Author SHA1 Message Date
Robert Speicher 5c80ceee0d Autofocus the email field on the password reset form 2015-09-30 15:39:59 -04:00
Robert Speicher 0bf60630c0 Merge branch 'fix-view-admin-applications-text' into 'master'
Fixes english information paragraph in admin/applications view

See merge request !1470
2015-09-30 17:50:37 +00:00
Diogo Resende bbb845b20b Adds newline at end of file 2015-09-30 17:28:06 +00:00
Diogo Resende 63a6259328 Adds missing plural form of applications of previous commit 2015-09-30 17:26:55 +00:00
Dmitriy Zaporozhets fe7e97320c Fix bug when removed file was not appearing in merge request diff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-30 12:31:23 +02:00
Dmitriy Zaporozhets 34431d8ecb Merge branch 'move-ci-settings' into 'master'
Move CI project settings page to CE project settings area

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Part of #2594 

See merge request !1465
2015-09-30 08:49:46 +00:00
Diogo Resende e471356f76 Fixes english information paragraph in admin/applications view 2015-09-30 08:34:00 +00:00
Dmitriy Zaporozhets 87240e989b Move CI project settings page to CE project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-29 16:07:44 +02:00
Dmitriy Zaporozhets 2e8a3e3996 Merge branch 'fix-link-to-projects-path-from-dashboard' into 'master'
Link directly to the projects page instead of the root controller

If "Your Projects' Activity" dashboard setting were selected, it would be impossible to navigate to the projects page since the redirection would always bounce back to the activity dashboard. 

Fixes bug introduced by !1446.


See merge request !1459
2015-09-29 13:33:09 +00:00
Dmitriy Zaporozhets 2c3355f958 Merge branch 'ci-commits-to-projects' into 'master'
Make Ci::Commits belong to Project instead of Ci::Project



See merge request !1455
2015-09-29 11:44:07 +00:00
Kamil Trzcinski 8f8efcfa00 Fix tests 2015-09-29 10:47:03 +02:00
Dmitriy Zaporozhets 2a0d4e7200 Move CI triggers page to project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-29 10:37:31 +02:00
Dmitriy Zaporozhets 3c997218f6 Merge branch 'projects' into 'master'
page-title-fix

Fixed .page-title margin

See merge request !1458
2015-09-29 07:29:07 +00:00
Stan Hu abae352e59 Link directly to the projects page instead of the root controller
If "Your Projects' Activity" dashboard setting were selected, it would be impossible to navigate to the projects page since the redirection would always bounce back to the activity dashboard.

Fixes bug introduced by !1446.
2015-09-28 21:24:24 -07:00
Andrey 59582aae57 page-title-fix 2015-09-28 17:58:30 +02:00
Dmitriy Zaporozhets 037defc7de Move CI variables page to project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-28 17:19:20 +02:00
Dmitriy Zaporozhets b656419591 Merge branch 'move-runners-page' 2015-09-28 16:47:18 +02:00
Douwe Maan 10c036fcf5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-28 15:43:27 +02:00
Douwe Maan 1c1c7e1abd Merge branch 'fxposter/gitlab-ce-login-from-admin' 2015-09-28 15:43:02 +02:00
Dmitriy Zaporozhets 145d933880 Merge branch 'projects'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-28 13:42:41 +02:00
Andrey ce49e49bfb edit action allign 2015-09-28 11:26:42 +02:00
Dmitriy Zaporozhets 92f8e0fd7e Finish move of runners page to project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-28 10:14:53 +02:00
Aaron Snyder a9cfa6c508 Fix grammar in admin area labels .nothing-here-block when no labels exist.
updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
2015-09-26 11:25:26 -07:00
Andrey 12acf15c90 Project page Update
refactoring buttons, fixes for projects filter on the dashboard and
group page
2015-09-25 20:33:05 +02:00
Dmitriy Zaporozhets b328c76c06 Move runners page to project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-25 18:03:41 +02:00
Stan Hu 04de85a994 Fix Error 500 occuring with repositories that have a bad HEAD
A repository could have objects but no valid HEAD, causing
`project.commit` to be `nil`.
2015-09-24 22:48:50 -07:00
Andrey 1f78c5d460 UI changes to the project view, empty project and project list new project button 2015-09-24 18:36:15 +02:00
Stan Hu 452621208c Fix default avatar not showing up in network graph
Closes https://github.com/gitlabhq/gitlabhq/issues/9657
2015-09-24 08:31:18 -07:00
Pavel Forkert 82eeb5e284 Remove stuff from previous UI 2015-09-24 16:38:52 +03:00
Pavel Forkert eb9528b8b9 Move login button to user page, switched to POST method 2015-09-24 16:34:04 +03:00
Pavel Forkert 83347954fc Add option to admin area to sign in as a specific user
Closes #2291
2015-09-24 16:14:16 +03:00
Dmitriy Zaporozhets 2759b13ae9 Remove CI dashboard
With CI status integrated at GitLab projects page there is no reason to keep it
anymore.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-24 15:10:25 +02:00
Dmitriy Zaporozhets 353d426e4e Show CI status on Your projects page and Starred projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-24 14:00:23 +02:00
Dmitriy Zaporozhets 9c4307e287 Show CI status on commit page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-24 11:21:39 +02:00
Dmitriy Zaporozhets 24e8445af6 Merge branch 'move-ci-charts' into 'master'
Move CI charts to project graphs area

Part of #2594 

Should be merged after !1405 


Same page but moved to another place 

![Screenshot_2015-09-23_16.25.15](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef7266de0528bd6dd3f95159e161ea9a/Screenshot_2015-09-23_16.25.15.png)


See merge request !1407
2015-09-24 09:03:13 +00:00
Douwe Maan ae3fba6cfa Merge branch 'rs-help-page' into 'master'
Help page improvements

- Only signed-in users can see version information
- Add "Community Edition" text so the header is
  less barren when version information is hidden
- Minor copy edits
- Make all "Quick help" link text the entire body
  of the link. Prior, it wasn't obvious which part
  of each item was an actual link.

Closes #2721 

See merge request !1415
2015-09-24 07:51:52 +00:00
Dmitriy Zaporozhets 64e12d5853 Add header for ci graphs and check that it is enabled
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-24 09:44:38 +02:00
Dmitriy Zaporozhets ea58395525 Merge branch 'master' into move-ci-charts 2015-09-24 09:40:32 +02:00
Douwe Maan a58c6e9a95 Merge branch 'cleanup-ci-dashboard' into 'master'
Cleanup ci dashboard

Part of #2594. Based on !1403

* remove rendering GitLab projects with not enabled CI on CI dashboard
* remove enabling CI for projects from CI dashboard (now its done by simply pushing `.gitlab-ci.yml`)
* simplify the projects query for CI dashboard 

See merge request !1405
2015-09-24 07:32:29 +00:00
Robert Speicher 45824aabc6 Allow non-admin users to see version information
We want users to know what features they have available (and to pressure
their admins to upgrade).
2015-09-23 17:18:15 -04:00
Robert Speicher be142e6bd6 Move the version_check_enabled check from view to helper 2015-09-23 16:28:51 -04:00
Zeger-Jan van de Weg 3d177a818f Add links to first and/or last page with kaminari
Also update Kaminari gem to the latest version
2015-09-23 22:15:16 +02:00
Robert Speicher 73288a8edb Add "Community Edition" to the version info on the help page
If the version information was hidden because the user was not an admin,
the "GitLab" text looked lonely. This also brings us more in line with
EE which shows "Enterprise Edition".
2015-09-23 16:03:52 -04:00
Robert Speicher de844ebf6c "fine grained" -> "fine-grained" 2015-09-23 16:03:38 -04:00
Robert Speicher 316358345a Make all "Quick help" link text the entire body of the link
Prior, it wasn't obvious which parts of each item was an actual link.
2015-09-23 16:02:21 -04:00
Robert Speicher ebcd503e93 Only surface version information on help index to admins
Closes #2721
2015-09-23 16:01:35 -04:00
Robert Speicher 32cb9d215d Merge branch 'make-commit-graphs-responsive' into 'master'
Make commit graphs responsive to window width changes

Closes #2653

See merge request !1395
2015-09-23 16:31:32 +00:00
Dmitriy Zaporozhets eae27d1ecb Move CI charts to project graphs area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23 16:24:46 +02:00
Dmitriy Zaporozhets c3f63d6f77 Fix search for ci projects and cleanup unnecessary code
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23 15:33:36 +02:00
Dmitriy Zaporozhets 31b15e3dce Simplify CI projects query
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23 15:30:24 +02:00