 Marin Jankovski
|
7d9ef1124e
|
Merge remote-tracking branch 'ce/master' into merge_ce
Conflicts:
README.md
app/assets/javascripts/project.js.coffee
app/models/concerns/mentionable.rb
app/models/project.rb
app/models/project_services/jira_service.rb
app/models/service.rb
app/models/user.rb
app/services/git_push_service.rb
config/initializers/1_settings.rb
config/routes.rb
db/schema.rb
doc/integration/README.md
doc/integration/external-issue-tracker.md
doc/integration/github.md
spec/controllers/import/github_controller_spec.rb
spec/helpers/merge_requests_helper.rb
spec/lib/gitlab/upgrader_spec.rb
spec/models/note_spec.rb
spec/requests/api/groups_spec.rb
spec/services/git_push_service_spec.rb
|
2015-02-16 11:50:30 -08:00 |
|
 Jeroen van Baarsen
|
0c4a70a306
|
Updated rspec to rspec 3.x syntax
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
2015-02-12 19:17:35 +01:00 |
|
 Valery Sizov
|
3fcd75a911
|
Merge CE master into EE master
Conflicts:
Gemfile
VERSION
app/assets/javascripts/project.js.coffee
app/assets/javascripts/users_select.js.coffee
app/controllers/projects/services_controller.rb
app/models/project.rb
app/views/groups/edit.html.haml
features/project/service.feature
features/steps/project/services.rb
spec/models/concerns/mentionable_spec.rb
|
2014-11-13 17:05:12 +02:00 |
|
 Dmitriy Zaporozhets
|
fd17ba9ffc
|
Mentioned users are not limited by project scope any more
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-10-30 13:26:45 +02:00 |
|
 Jacob Vosmaer
|
834b23a750
|
Fix JIRA issue reference bug
|
2014-06-13 18:24:30 +02:00 |
|
|
Dmitriy Zaporozhets
|
cce80d04fe
|
Remove author_id_of_changes from spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-03-25 14:02:55 +02:00 |
|
 skv
|
d89527839e
|
fix most of warnings
|
2013-12-15 00:05:10 +04:00 |
|
|
Dmitriy Zaporozhets
|
a73e068c06
|
Fixing tests after adding iid for issues/mr
|
2013-08-20 16:56:05 +03:00 |
|
 Andrew8xx8
|
f97296597c
|
Issuable consern uses StateMachine now
|
2013-02-18 14:43:49 +04:00 |
|
|
Dmitriy Zaporozhets
|
e65731bb7e
|
Add concerns to autoload
|
2013-01-03 09:12:24 +02:00 |
|