Commit graph

3146 commits

Author SHA1 Message Date
jdamick 26124e40ef Merge branch 'master' of github.com:jdamick/gitlabhq 2012-06-18 11:48:18 -04:00
jdamick 848b5e99fc moved the ldap login to its own partial and cleaned up the forms a little bit 2012-06-18 11:45:49 -04:00
jdamick 50dabb5452 customizing the user login screen for primarily ldap authentication 2012-06-18 11:45:49 -04:00
jdamick f296d27648 moved the ldap login to its own partial and cleaned up the forms a little bit 2012-06-18 11:40:14 -04:00
randx eb00cb69dd Test only 1.9.3 on travis 2012-06-17 23:05:33 +03:00
randx 6f398a4dcd Install charlock for travis 2012-06-17 22:53:40 +03:00
randx f909e25d1b Improve gitlab encode method 2012-06-17 22:00:13 +03:00
randx 5ff658a607 no pending cucumber for travis 2012-06-17 19:19:01 +03:00
randx 60db88ad34 Lets change how cucumber run on travis 2012-06-17 18:40:00 +03:00
randx cd3f55a310 Fix travis 2012-06-17 18:33:13 +03:00
Dmitriy Zaporozhets dbc7ef21d1 Merge pull request #932 from gitlabhq/cucumber
Cucumber
2012-06-16 03:46:14 -07:00
randx e15a2b9695 Keep network graph pending 2012-06-16 13:45:51 +03:00
randx 67f445afea fixed type 2012-06-16 13:31:21 +03:00
randx 8189082e4c fix ci run 2012-06-16 13:20:17 +03:00
randx 6745a5e5c1 Cucumber -> Network graph feature 2012-06-16 13:03:20 +03:00
randx 781fd1a80c Cucumber -> Dashboard features 2012-06-16 12:50:14 +03:00
jdamick 6ace52bb2b customizing the user login screen for primarily ldap authentication 2012-06-15 17:07:53 -04:00
randx 85b86e6476 travis updated 2012-06-15 19:01:39 +03:00
Dmitriy Zaporozhets da400b215e Merge pull request #931 from goshakkk/comments-anchors
Add HTML anchors for comments
2012-06-15 08:54:55 -07:00
Gosha Arinich 482f1a7d19 Add HTML anchors for comments #929 2012-06-15 18:53:00 +03:00
Valeriy Sizov b9ab93e108 Merge pull request #930 from benphelps/patch-1
Fix typo in wiki page last edited message.
2012-06-14 23:37:07 -07:00
Dmitriy Zaporozhets 5bbf3ccf05 Cucumber:
* Profile
* Browse code
* Sceleton for main features
* Wiki
* Commits
2012-06-15 07:15:28 +03:00
Ben Phelps 6ff99fe945 Change "in" to "ago" in last edited message. 2012-06-14 20:51:01 -05:00
Dmitriy Zaporozhets a78908c697 mailObserver quickfix 2012-06-14 12:45:22 +03:00
Dmitriy Zaporozhets 72b9c14ebc refactored mail observer 2012-06-14 08:24:10 +03:00
Dmitriy Zaporozhets f5ee330a13 Few css fixes for dark theme 2012-06-14 10:43:45 +03:00
randx 36e88b960a CSS refactoring 2012-06-13 20:02:30 +03:00
Dmitriy Zaporozhets d143680c64 Merge pull request #923 from NARKOZ/refactoring-2
Minor cleanup
2012-06-13 05:44:58 -07:00
Nihad Abbasov 51c30d90d4 fix broken spec 2012-06-13 05:36:51 -07:00
Nihad Abbasov e735763f27 remove useless index method from projects controller
see edd81a79c5
2012-06-13 05:22:40 -07:00
Nihad Abbasov d1953a2640 no need to extend assets path anymore
see 865cf830c4
2012-06-13 05:19:02 -07:00
Dmitriy Zaporozhets a243253b10 Refactored project archive. Improved MR usability form 2012-06-13 09:03:53 +03: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
randx 9ef9c58f55 Better UI for projects list on dahboard 2012-06-12 22:04:57 +03:00
randx 5f5cd2be13 ui-box style improved 2012-06-12 21:55:10 +03:00
randx 093159a868 Styled snippets. Raw button for snippet 2012-06-12 21:41:46 +03:00
randx b96af79bb8 Specs for last push widget 2012-06-12 21:15:34 +03:00
Dmitriy Zaporozhets e0d1fba15e Recent push event 2012-06-12 17:43:16 +03:00
Dmitriy Zaporozhets 40af6e1ad2 few improvements for ui 2012-06-12 16:36:27 +03:00
Dmitriy Zaporozhets 6fa95a3d34 CSS refactored 2012-06-12 14:58:44 +03:00
Dmitriy Zaporozhets 0e33bf6eb0 Refactored IssuesController 2012-06-12 11:31:38 +03:00
Dmitriy Zaporozhets 3a2d7a6604 Merge pull request #917 from teaminsight/queue_fix
Connection fix for resque worker
2012-06-11 14:04:33 -07:00
jcredding 294dfe15ca added connection fix initializer, helps long running resque workers not fail 2012-06-11 15:58:58 -05:00
randx 04bf40a923 Refactored theme css, added Modern theme pre version 2012-06-11 20:52:32 +03:00
Dmitriy Zaporozhets a6dad85d2f Get rid of modularity gem, Styled 'nothing here' message 2012-06-11 13:55:38 +03:00
Valeriy Sizov 4a14db9391 Merge pull request #916 from mvrhov/patch-1
Add missing libyaml-dev to debian install script
2012-06-11 03:46:04 -07:00
Miha Vrhovnik 9e2ec7ee28 Add missing libyaml-dev 2012-06-11 10:43:57 +03:00
Valeriy Sizov e0880559bd Merge pull request #914 from oreofish/betterqueue
only address resque works in post_receive and mailer queue
2012-06-10 11:40:53 -07:00
RickXing 81f666d8dc only address resque works in post_receive and mailer queue 2012-06-10 17:11:34 +08:00
Dmitriy Zaporozhets 5759f97598 Merge pull request #908 from avakarev/update-rails-to-3.2.5
Update rails version to 3.2.5
2012-06-10 01:36:41 -07:00