Dmitriy Zaporozhets
7ae72e6511
Merge pull request #4323 from axilleas/update_docs
...
Create uploads dir otherwise backup fails. Fix #4304
2013-06-28 21:55:13 -07:00
Dmitriy Zaporozhets
3e4de1ded4
Use triangle for current tab highlight
2013-06-28 23:33:14 +03:00
Dmitriy Zaporozhets
f15e8a0cfe
better align for main-nav
2013-06-28 23:11:27 +03:00
Gábor Egyed
45ecbb0358
fixed nav bar for empty repos ( fixes #4375 )
2013-06-26 22:11:41 +02:00
Dmitriy Zaporozhets
b143976bfa
Fixed showing files, commits tabs for empty project
2013-06-26 23:00:15 +03:00
Dmitriy Zaporozhets
49fcbdbd1e
Test user page with spinach
2013-06-26 21:50:47 +03:00
Dmitriy Zaporozhets
6c0fd9f29a
Add scenario for expired password
2013-06-26 21:34:20 +03:00
Dmitriy Zaporozhets
318b50a0b3
Add profile notification spinach
2013-06-26 20:54:51 +03:00
Dmitriy Zaporozhets
6642709faa
Fix route specs
2013-06-26 20:17:07 +03:00
Dmitriy Zaporozhets
d0779d61d3
Merge pull request #4239 from karlhungus/feature-alt-text-for-gravatars
...
Gravatar image fixes when gravatar unavailable
2013-06-26 10:10:14 -07:00
Dmitriy Zaporozhets
467e7c10b5
Add more autocomplete options to project search
2013-06-26 19:25:07 +03:00
Dmitriy Zaporozhets
01cf474fa1
Fix spinach test
2013-06-26 19:13:29 +03:00
Dmitriy Zaporozhets
3c4689c23c
Store satellites lock files inside satellites dir
2013-06-26 18:35:32 +03:00
Dmitriy Zaporozhets
9f087fb9e7
more entries in changelog
2013-06-26 18:15:50 +03:00
Izaak Alpert
d1da45e1a3
Rebasing on master
...
Change-Id: Iad49f225f23675b843457df5d6965c7cd50e99a3
2013-06-26 11:08:55 -04:00
Dmitriy Zaporozhets
f50cb7fc9f
Add keyboard nav for tree view. Refactor tree-view coffee
2013-06-26 16:58:56 +03:00
Dmitriy Zaporozhets
1dd80d22a5
Prevent confusion in naming user variable at admin area
2013-06-26 15:57:02 +03:00
Izaak Alpert
c1b05e7b86
Gravatar image fixes when gravatar unavailable
...
-Alt text to image was set to hash, which would make the page display hashes if the image/gravatar wasn't available, set the alt text to '', and made the main tool bar image follow the same or similar constraints as the other images (.avatar, .s26)
Conflicts:
app/assets/stylesheets/themes/ui_bb.scss
app/views/snippets/_snippet.html.haml
Change-Id: I42e1e86f535486fd2556d4b3e4591f3676eea033
2013-06-26 08:53:03 -04:00
Dmitriy Zaporozhets
21f7c99c25
group add_users spec
2013-06-26 15:32:09 +03:00
Dmitriy Zaporozhets
a064060096
Test admin:group#index
2013-06-26 15:09:17 +03:00
Dmitriy Zaporozhets
112e919823
Remove unnecessary namespaced resource
2013-06-26 15:02:28 +03:00
Dmitriy Zaporozhets
a5dbe35354
Improve change group ownership logic
2013-06-26 14:51:57 +03:00
Dmitriy Zaporozhets
db03bfa868
Apply user project limit only for personal projects. We should not include group projects for user limit
2013-06-26 14:41:03 +03:00
Dmitriy Zaporozhets
579c0b9791
Merge pull request #4393 from dosire/scrum-improvements
...
Rename unspecified to make it clearer and in line with scrum terminology
2013-06-25 23:24:38 -07:00
Dmitriy Zaporozhets
743c232b16
Merge pull request #4412 from senny/fix_bad_constant_reference
...
fix bad constant reference in `project_routing_spec.rb`.
2013-06-25 22:57:33 -07:00
Yves Senn
95353aa6c4
Merge pull request #4419 from jlgeering/master
...
whitespaces in gitlab.yml.example
2013-06-25 22:55:13 -07:00
Dmitriy Zaporozhets
f7199bb1fb
Merge pull request #4361 from kenips/master
...
Add missing assigned_to renaming to merge_requests_load_context
2013-06-25 22:12:29 -07:00
Dmitriy Zaporozhets
0a0cdc6c61
Limit amount of contributors at graph to 100 persons
2013-06-25 17:34:50 +03:00
Dmitriy Zaporozhets
58427749fd
Update repository head when change default project branch
2013-06-25 17:05:39 +03:00
Dmitriy Zaporozhets
0705a7a507
Changelog updated. Added migrate docs for 6.0
2013-06-25 16:49:27 +03:00
Dmitriy Zaporozhets
d0529ad21d
Fixed cache key difference for graph
2013-06-25 14:19:33 +03:00
Dmitriy Zaporozhets
11c9b06f7c
Fix key observer spec
2013-06-25 14:12:38 +03:00
Jean-Luc Geering
01d694aaba
whitespaces in gitlab.yml.example
2013-06-25 14:01:41 +03:00
Dmitriy Zaporozhets
dc91755264
Cache graph log
2013-06-25 13:55:03 +03:00
Dmitriy Zaporozhets
367a5d1b32
remove text decoration for nav
2013-06-25 13:41:49 +03:00
Dmitriy Zaporozhets
c71697abc9
Make nav menu a bit higher
2013-06-25 13:16:08 +03:00
Dmitriy Zaporozhets
746ffcfcbd
Make group settings menu looks similar to project settings menu
2013-06-25 13:15:07 +03:00
Dmitriy Zaporozhets
8fb84104e4
Use graph ticks to make axis more readable
2013-06-25 12:39:58 +03:00
vagrant
52feefb8e1
Merge remote-tracking branch 'upstream/master'
2013-06-25 09:05:02 +00:00
Dmitriy Zaporozhets
d40e6bc228
Fix key observer
2013-06-25 12:02:10 +03:00
Jack Weeden
c00917e48f
Don't show 'Filter by labels' text if there are no labels
...
Don't show project search form if there are no projects
2013-06-25 09:49:09 +01:00
Dmitriy Zaporozhets
a01db3d636
Merge branch 'contributing-pull-requests' of /home/git/repositories/gitlab/gitlabhq
2013-06-25 06:18:07 +00:00
Dmitriy Zaporozhets
059baa09f9
Merge branch 'gem-update-policy' of /home/git/repositories/gitlab/gitlabhq
2013-06-25 06:17:54 +00:00
Dmitriy Zaporozhets
6d15e64588
Merge branch 'animated-gif' of /home/git/repositories/gitlab/gitlabhq
2013-06-25 06:17:14 +00:00
Jack Weeden
82271e7818
Added tooltip to snippet public/private icons
2013-06-24 23:57:26 +01:00
Jack Weeden
1aeebdf681
Added delete button to snippet view
2013-06-24 23:55:37 +01:00
Dmitriy Zaporozhets
d41940d36e
Merge branch 'master' into 6-0-dev
...
Conflicts:
app/views/projects/issues/show.html.haml
db/fixtures/development/09_issues.rb
db/fixtures/development/10_merge_requests.rb
2013-06-24 22:13:00 +03:00
Dmitriy Zaporozhets
106764ab3b
update gems. remove console.log
2013-06-24 22:03:32 +03:00
Dmitriy Zaporozhets
89a1e7e1f5
Fix ssh key test
2013-06-24 21:00:33 +03:00
Dmitriy Zaporozhets
b4a9cab7f0
Fix ssh key test
2013-06-24 20:47:59 +03:00
Dmitriy Zaporozhets
Gábor Egyed
Izaak Alpert
Yves Senn
Jean-Luc Geering
vagrant
Jack Weeden