 Dmitriy Zaporozhets
|
89ac4f1d56
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/project.rb
|
2015-06-12 14:01:20 +02:00 |
|
 Robert Speicher
|
584f8601ef
|
Change within to page.within in feature steps
|
2015-06-12 05:12:42 -04:00 |
|
|
Robert Speicher
|
69bbc413fe
|
Update all should-style syntax to expect in features
|
2015-06-12 05:12:09 -04:00 |
|
|
Dmitriy Zaporozhets
|
3840549566
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Conflicts:
app/assets/javascripts/dispatcher.js.coffee
features/admin/settings.feature
features/steps/admin/settings.rb
features/steps/user.rb
features/user.feature
lib/gitlab/git_access.rb
|
2015-03-25 09:16:09 -07:00 |
|
|
Dmitriy Zaporozhets
|
b449bc5b77
|
Improve user calendar test
|
2015-03-22 19:47:23 -07:00 |
|
|
Dmitriy Zaporozhets
|
54aca18cf8
|
Contribution calendar will use events instead of commits to count contributions
|
2015-03-22 14:35:27 -07:00 |
|
|
Dmitriy Zaporozhets
|
43afe46bbd
|
Refactor contributions events and write tests for calendar
|
2015-03-22 13:55:00 -07:00 |
|
|
Dmitriy Zaporozhets
|
a5972170ad
|
Merge remote-tracking branch 'origin/master' into ee-7-4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/projects/team_members_controller.rb
app/finders/projects_finder.rb
app/models/group.rb
app/models/project_team.rb
app/models/users_group.rb
config/gitlab.yml.example
config/initializers/1_settings.rb
config/routes.rb
db/schema.rb
doc/integration/ldap.md
features/steps/group.rb
features/steps/project/project.rb
|
2014-10-02 13:24:59 +03:00 |
|
 Ciro Santilli
|
89f7345f3f
|
Remove unnecessary page. from tests.
|
2014-09-26 09:51:17 +02:00 |
|
 Marin Jankovski
|
0b9f6c589e
|
Update the tests after base change.
|
2014-08-22 11:08:30 +02:00 |
|
|
Marin Jankovski
|
b5342de57b
|
Add admin notification unsubscribe feature
|
2014-08-22 10:45:45 +02:00 |
|
|
Ciro Santillli
|
91571c078d
|
User pages are visible to users without login
... if the user is authorized to at least one public project.
|
2014-02-11 15:45:30 +01:00 |
|