Valery Sizov
71a844cdae
Web Editor: save to new branch
2015-02-24 11:43:20 +02:00
Dmitriy Zaporozhets
9459e9db24
Fix updating issue 500 error
2015-02-22 22:26:09 -08:00
Vinnie Okada
2a9eed6620
Merge branch 'master' into rails-4.1.9
...
Conflicts:
app/views/projects/commits/_commit.html.haml
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue_context.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/show/_context.html.haml
2015-02-21 12:55:28 -07:00
Dmitriy Zaporozhets
5484acd998
Merge branch 'empty-project-redirect-vs-404' into 'master'
...
Redirect from /tree/master on empty repo instead of showing 404.
See https://gitlab.com/gitlab-org/gitlab-ce/issues/1114
See merge request !1559
2015-02-21 02:01:21 +00:00
Douwe Maan
00408f37e3
Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404.
2015-02-20 17:20:03 +01:00
Douwe Maan
938a1381fc
Satisfy Rubocop.
2015-02-20 16:04:03 +01:00
Douwe Maan
00ca490259
Use controllers to serve uploads, with XSS prevention and access control.
2015-02-20 13:13:48 +01:00
Vinnie Okada
9e9ce95d62
Merge branch 'master' into rails-4.1.9
...
Conflicts:
app/views/dashboard/_project.html.haml
app/views/events/event/_common.html.haml
app/views/explore/projects/_project.html.haml
app/views/groups/_projects.html.haml
app/views/projects/_home_panel.html.haml
app/views/projects/_issues_nav.html.haml
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/show.html.haml
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_show.html.haml
app/views/projects/milestones/index.html.haml
app/views/projects/notes/_edit_form.html.haml
app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
Dmitriy Zaporozhets
2ad00f5294
Merge branch 'tweet-new-project'
...
Conflicts:
db/schema.rb
2015-02-15 19:03:10 -08:00
Vinnie Okada
76aad9b76e
Upgrade to Rails 4.1.9
...
Make the following changes to deal with new behavior in Rails 4.1.2:
* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Douwe Maan
07d05d2df7
Move all event creation to EventCreateService.
2015-02-13 12:02:58 +01:00
Marin Jankovski
1a89db5ffb
Try to test settings added in the service.
2015-02-12 13:02:58 -08:00
Dmitriy Zaporozhets
0a34f2dcb5
Merge pull request #8580 from j0k3r/asana
...
Add Asana service
2015-02-08 01:12:41 -08:00
Dmitriy Zaporozhets
8952fc015f
Apply default scope to labels and remove one for notes
2015-02-05 20:29:41 -08:00
Valery Sizov
b9d9ac82a9
Commit page: async load branches info
...
Conflicts:
config/routes.rb
2015-02-03 09:10:56 -08:00
Dmitriy Zaporozhets
61cc6a9244
Rubocop: indentation fixes Yay!!!
2015-02-02 21:59:28 -08:00
Dmitriy Zaporozhets
d04344373b
Rubocop: no trailing newlines
2015-02-02 21:53:27 -08:00
Dmitriy Zaporozhets
647ff6240e
Rubocop: Style/ElseAlignment enabled
2015-02-02 21:38:50 -08:00
Dmitriy Zaporozhets
cc39bca3fa
Rubocop: Style/AlignHash enabled
2015-02-02 21:15:44 -08:00
Jeremy
3cd1eda5a4
Add restrict_to_branch to service controller
...
And add restrict_to_branch to spec
2015-02-02 09:59:42 +01:00
Marin Jankovski
68f7302474
Add a scope for visible services, code styling changes for easier readability.
2015-01-28 14:25:55 -08:00
Marin Jankovski
537cd66d7e
Add gitlab internal issue tracker service.
2015-01-28 09:28:17 -08:00
Marin Jankovski
ededa98995
Shorter check in services controller.
2015-01-26 22:46:54 -08:00
Marin Jankovski
0da59cb55b
Merge branch 'master' into move_external_issue_tracker_away_from_yml_config
...
Conflicts:
app/models/project.rb
spec/models/project_spec.rb
2015-01-26 22:12:53 -08:00
Dmitriy Zaporozhets
ed91378627
Fix blob controller rendering in case of errors
2015-01-26 15:12:13 -08:00
Dmitriy Zaporozhets
59b08942aa
Refactor blob controllers
2015-01-26 15:02:28 -08:00
Dmitriy Zaporozhets
c916124178
Explicitly set before_filter for ref-related controllers
2015-01-26 15:01:51 -08:00
Marin Jankovski
65e700472b
Update the issue tracker attribute on issue tracker change.
2015-01-26 11:39:32 -08:00
Steven Thonus and Hannes Rosenögger
42bac7f9f2
adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix
2015-01-24 18:51:16 +01:00
Dmitriy Zaporozhets
4225dad45e
Merge branch 'ruby-19-hash' into 'master'
...
Ruby 1.9 hash
See merge request !1430
2015-01-24 05:06:12 +00:00
Dmitriy Zaporozhets
a6bdf7d876
Show success/error message for test services button
2015-01-23 20:50:17 -08:00
Dmitriy Zaporozhets
3dfcb95f0d
Use ruby 1.9 hash syntax
2015-01-23 17:41:10 -08:00
Marin Jankovski
c70dcd2907
Merge branch 'master' into move_external_issue_tracker_away_from_yml_config
2015-01-23 12:38:46 -08:00
Dmitriy Zaporozhets
2b10520b30
Merge pull request #7999 from cirosantilli/append-inplace
...
Append in place for strings and arrays [failure unrelated]
2015-01-21 23:07:15 -08:00
Dmitriy Zaporozhets
2395b8f079
Merge branch 'show_tags_in_commit_view' into 'master'
...
Show tags in commit view
### What does this MR do?
With this MR you can see the assigned tags for a commit in the commit view.
### Are there points in the code the reviewer needs to double check?
I don't think so. But it would be awesome if the reviewer can tell me how to add a tag to the sample_commit in spec/support/repo_helpers.rb.
Then I can add a test for the new tag_names_contains method as soon as possible :)
### Why was this MR needed?
At the moment if one click on a commit will see details such as: parent commit, amount of additions, deletions, but will not see if this commit has Tag linked to it.
Showing branch, tag details will give better overview about the commit
### What are the relevant issue numbers / Feature requests?
Feature request: http://feedback.gitlab.com/forums/176466-general/suggestions/3962044-show-tags-in-commit-view
### Screenshots
@dblessing Can you take a look at this MR as well please?
See merge request !297
2015-01-21 18:23:46 +00:00
Valery Sizov
ab7a79bf3b
developer can push to protected branches
2015-01-20 17:34:23 -08:00
Marin Jankovski
62c00661c4
Allow creation of the jira and redmine services.
2015-01-20 16:47:29 -08:00
Hannes Rosenögger
8243eb3f0e
Show tags in commit view
2015-01-17 19:22:35 +01:00
Dmitriy Zaporozhets
bba8e59a04
Fix test hook and tests
2015-01-12 09:08:25 -08:00
Dmitriy Zaporozhets
3197044512
Refactor push data builder. Moved it to separate class
...
Also execute GitLab CI on creating tag via UI
2015-01-11 23:51:31 -08:00
Dmitriy Zaporozhets
9c03c1c545
Make automerge via satellite
2015-01-09 19:10:01 -08:00
Dmitriy Zaporozhets
4165426725
Restyle and refactor milestones filter
2015-01-06 12:32:04 -08:00
Ciro Santilli
33c9f05c6b
Append in place for strings and arrays
2015-01-01 21:12:00 +01:00
Marin Jankovski
42fb42aed4
Merge branch 'master' into developer_can_push_to_protected_branches_option
...
Conflicts:
db/schema.rb
2014-12-29 09:30:55 +01:00
Dmitriy Zaporozhets
25a42a56cf
Merge pull request #8439 from glasspelican/Teamcity
...
Teamcity integration using 8.1 rest api
2014-12-28 22:11:29 +02:00
Marin Jankovski
16ebeedef2
Update branch status with ajax call.
2014-12-26 15:37:04 +01:00
Marin Jankovski
92eb3974ac
Add option to disable/enable developers push to already protected branches.
2014-12-26 11:39:12 +01:00
Marin Jankovski
b7eb0d178e
Add checkbox for protected branch developer can push to.
2014-12-26 09:14:53 +01:00
Dmitriy Zaporozhets
016981c009
Refactor issuable list pages
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-24 11:04:33 +02:00
Jason Lippert
1fa19401e9
Teamcity interaction using 8.1 rest api
2014-12-23 12:38:25 -05:00
Valery Sizov
Dmitriy Zaporozhets
Vinnie Okada
Dmitriy Zaporozhets
Douwe Maan
Marin Jankovski
Valery Sizov
Jeremy
Steven ThonusandHannes Rosenögger
Ciro Santilli
Jason Lippert
