Commit graph

192 commits

Author SHA1 Message Date
Dmitriy Zaporozhets f9eda9b33a Group filtering on dashboard 2012-10-02 19:37:53 +03:00
Cyril be18397d82 rename ProjectController to ProjectResourceController 2012-09-27 20:59:42 +02:00
Cyril e563e948bb Merge branch 'master' into simplify_controllers2
Conflicts:
	app/controllers/commits_controller.rb
	app/controllers/refs_controller.rb
2012-09-27 12:25:52 +02:00
Robert Speicher d8f7748dea Remove app_menu and project_menu partials
Now it's consistent across layouts where their main menus are.
2012-09-26 17:00:52 -04:00
Robert Speicher 36f68140d1 Replace various "active tab" checks with nav_link
Also remove now-unused tab_class helper
2012-09-26 16:38:28 -04:00
Robert Speicher 0887dda8e4 Use current ref for Files and Commits if available
Closes #1452
2012-09-26 16:32:25 -04:00
Robert Speicher b62d6a1fe2 Remove commit_tab_class helper 2012-09-26 16:32:25 -04:00
Robert Speicher 86a7864dc7 Fix various links 2012-09-26 16:32:25 -04:00
Robert Speicher 8fe63dab52 Use current_controller? in layouts/_head partial 2012-09-26 16:32:24 -04:00
Robert Speicher 51c1e49900 Change active tab and nav class to "active"
The main nav used active, the sub nav used current. This normalizes it.
2012-09-26 16:32:24 -04:00
Robert Speicher 1048917232 Update usages of project_commit[s] route helpers 2012-09-26 16:32:23 -04:00
Robert Speicher 3574826920 Use Commits#show instead of Commits#index
Takes tree-ish + path as ID
2012-09-26 16:32:22 -04:00
Robert Speicher 79a02df92e Update usages of tree_file_project_ref_path to project_tree_path 2012-09-26 16:32:21 -04:00
Cyril bdf317addc layout selected by controller name 2012-09-26 22:27:44 +02:00
Dmitriy Zaporozhets dc37c8aaae Refactored profile area 2012-09-14 19:13:25 +03:00
Dmitriy Zaporozhets 621affecb5 Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master
Conflicts:
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/sessions/new.html.erb
	db/schema.rb
2012-09-12 06:49:52 +03:00
Robert Speicher 3b89f14090 Convert main.js to coffee
Remove duplicate 's' hotkey code
2012-09-09 07:28:41 -04:00
Alex Denisov 09a86bd4d6 Capitlization of /gitlab/i normalized. #1367 2012-09-06 11:21:35 +03:00
Florian Unglaub 48443d20ca Merge branch 'master' of git://github.com/gitlabhq/gitlabhq 2012-08-24 15:25:52 +02:00
randx b2b88b2ff2 Added font for head panel. Major restyle for header 2012-08-20 22:51:37 +03:00
Florian Unglaub a64aff2f1c Omniauth Support 2012-08-17 15:20:55 +02:00
Dmitriy Zaporozhets 05da3801f5 Restyled erros pages & avatar class 2012-08-16 09:13:50 +03:00
Martin Bastien 6641761e5c Fix current class for hooks tab in admin section
Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>
2012-08-15 00:03:13 -04:00
Robert Speicher 7754189187 Fully embrace Ruby 1.9 hash syntax
Didn't bother with files in db/, config/, or features/
2012-08-10 18:25:15 -04:00
Dmitriy Zaporozhets 354d243878 Merge pull request #983 from JamesEarlDouglas/notify-grammar
cleanup the wording of the notification footer
2012-07-28 07:38:17 -07:00
randx 4261acda90 move SSH keys tab closer to begining 2012-07-21 10:27:09 +03:00
Valeriy Sizov c38578428b System Hooks: CRUD has done 2012-07-19 00:25:10 +03:00
Staicu Ionut ba7b85d0d9 issues counter are now live updated on creation/deleteion/reopening
buttons on forms are disabled on submit (re-enabled after the request is complete)
2012-07-10 07:33:04 +03:00
Dmitriy Zaporozhets 4c24cabf47 Merge pull request #1012 from NARKOZ/devise
Add 10 minutes lock after 10 failed login attempts (Devise :lockable)
2012-07-06 08:18:18 -07:00
Nihad Abbasov 2abd054b0c update devise 2012-07-05 23:50:24 -07:00
Dmitriy Zaporozhets 0a6b64e6a9 MR: Handle broken diff ex. in case its too huge 2012-07-05 22:59:37 +03:00
Dmitriy Zaporozhets d40b9ce26d Admin gitolite logs. Refactored project creation. Few style fixes. 2012-07-05 21:59:37 +03:00
Dmitriy Zaporozhets 031ae7756e Refactored navigation 2012-07-03 20:52:48 +03:00
Dmitriy Zaporozhets b3a0ee8e63 Fix MR tab width 2012-07-02 12:15:23 +03:00
James Earl Douglas cc7369305c cleanup the wording of the notification footer 2012-06-29 12:52:38 -07:00
gleb 2da45e9cbf Refs #1013
Renamed protect_resque.rb => resque_authentication
Integrated resque web with the rest of gitlab
2012-06-29 13:46:24 +02:00
randx edd81a79c5 Dashboard refactoring:
* dashboard should be in dashboard controller not project index
* projects index removed
2012-06-12 23:13:42 +03:00
Andrey Vakarev 3bd06d55e0 Remove trailing whitespaces and trailing lines 2012-06-04 01:37:27 +03:00
Nihad Abbasov f8f6ff065e add projects atom feed 2012-05-31 23:42:02 -07:00
Dmitriy Zaporozhets 1e4d15b406 Password & token split up, icon to button for top panel 2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets be79c9def9 CSS improvements for diff & file view 2012-05-15 19:35:18 +03:00
Dmitriy Zaporozhets 2746be6ce3 Home button should targeted on root page of context 2012-04-24 21:47:01 +03:00
gitlabhq c9af8e7579 New project page improved. User profile improved. Show issues, participant on Milestone show page. 2012-04-24 21:49:34 +03:00
Dmitriy Zaporozhets 71819dc344 logo changed for header 2012-04-22 16:01:59 +03:00
Dmitriy Zaporozhets 9ee345750c fixed admin root path for header 2012-04-20 22:51:57 +03:00
randx 35e21b3402 Admin dashboard 2012-04-20 19:41:49 +03:00
Dmitriy Zaporozhets c9def945d4 User blocking improved. Admin area styled 2012-04-16 23:33:03 +03:00
Dmitriy Zaporozhets 95fde9bd7a Projects page as dashboard. Old dashboard removed 2012-04-14 11:20:45 +03:00
randx 627efddf63 migrated to bootstrap 2 2012-04-10 08:51:08 +03:00
Dmitriy Zaporozhets d98b183361 first pack of tests for milestones 2012-04-09 01:01:42 +03:00