8ad9a75f88
Merge pull request #8030 from cirosantilli/factor-authorize
...
Factor authorize_push! and authorize_code_access!
2014-10-21 11:43:12 +03:00
5ce9f89c7b
Merge pull request #8102 from cirosantilli/use-memoized-project
...
Use @project on controllers, don't call method
2014-10-21 11:41:03 +03:00
9e1b97ad99
Use @project on controllers, don't call method
...
Also memoize the method to ensure that other methods in
ApplicationController that rely on it can call it efficiently.
2014-10-19 23:36:23 +02:00
4d0d5e79ba
Factor authorize_push! and authorize_code_access!
...
with existing method_missing. Pattern already used extensively,
so let's be consistent and use it everywhere.
2014-10-13 21:31:49 +02:00
2d23522107
Use :message key, not :error for File::Service.
2014-10-13 20:55:09 +02:00
47f539f5a6
Snippets: public/internal/private
2014-10-09 17:09:53 +03:00
ceaebe233c
Remove outdated comment from commits_controller
2014-10-07 18:52:16 +02:00
70004f4ef6
Merge branch 'slack_integration' into 'master'
...
Slack integration
See merge request !1151
2014-10-06 16:14:48 +00:00
1db8d3104c
Add missing comma.
2014-10-06 11:51:15 +02:00
2017977214
Use only webhook for slack service integration.
2014-10-06 10:44:01 +02:00
9f0083a96c
Add task lists to issues and merge requests
...
Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a
list item and turn it into a checkbox input. Users who can modify the
issue or MR can toggle the checkboxes directly or edit the Markdown to
manage the tasks. Task status is also displayed in the MR and issue
lists.
2014-10-05 22:15:27 -05:00
d1fa3b336d
Add Pushover service integration
...
That introduce select field type for services options.
2014-10-03 13:54:37 +02:00
4ebe718d69
Merge branch 'factor-commit-msg-textarea' of https://github.com/cirosantilli/gitlabhq into cirosantilli-factor-commit-msg-textarea
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/projects/blob/_remove.html.haml
2014-10-03 13:34:25 +03:00
8e33f9460c
Show test coverage results in MR if available
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-02 18:17:47 +03:00
3098e7a453
Factor commit message textareas.
2014-10-02 12:03:30 +02:00
0f12e051c0
Remove statement without effect.
2014-09-30 17:53:54 +02:00
88b1e0ffcd
Faster branch contains detection for commit
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-29 16:40:13 +03:00
3a8cd1fa59
Refactor commits graph
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-29 12:05:17 +03:00
6d0ddf45ba
Raw implementation of commits stats page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-26 20:32:44 +03:00
20e0c9b132
Rewrite graphs feature
...
* remove commits stats page (will be replaced by graphs)
* remove additions/deletions from graph because of bad performance
* keep graph logic in gitlab
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-26 18:04:41 +03:00
810028f3f3
Dont show blocked users in assignee filter
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 19:05:27 +03:00
3a72af480d
Merge branch 'use-more-rugged' into 'master'
...
Make GitLab CE works with new gitlab_git
Recently we removed grit dependency from `gitlab_git` in favor of rugged.
This changes make GitLab works with new library.
See merge request !194
2014-09-25 13:58:20 +00:00
619c81b488
Fix Commit stats and diff encoding issues
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 15:26:35 +03:00
184e0f8df1
Fix non-showing error message when edit file via web
2014-09-24 19:15:37 +03:00
db12e2dc8d
Merge pull request #7807 from cirosantilli/factor-service-error
...
Factor error and success methods from services.
2014-09-22 21:00:11 +03:00
ad47993ac4
Factor error and success methods from services.
2014-09-21 11:43:05 +02:00
1aa48174db
Fix STI+polymorphic for Group <-> GroupMember
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 21:52:54 +03:00
8210d81381
Replace old references of users_project & users_group
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 19:51:54 +03:00
c69b8e0459
Huge replace of old users_project and users_group references
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 19:32:51 +03:00
37a274a568
update tags count if tag gets deleted
2014-09-12 07:35:57 +02:00
218219abbd
Refactoring inside refactoring. We need to go deeper
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 21:54:52 +03:00
531f16beb0
Use new diff parsing logic
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 16:27:12 +03:00
60a98584f6
Merge pull request #7658 from Razer6/refresh_labels_page_on_delete
...
Show labels help message if last label is deleted
2014-09-05 14:39:40 +03:00
bd2355191f
Show labels help message if last label is deleted
2014-09-04 23:15:28 +02:00
468b2e8e0b
Added annotated tags. Updated tag haml file and call to gitlab-shell. Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG.
2014-09-04 09:47:20 -04:00
392113919a
Validate tag-names and references in WebUI, API
2014-09-03 13:08:36 +02:00
551145bc98
Validate branch-names and references in WebUI, API
...
Add specs for GitRefValidator
2014-09-03 13:08:35 +02:00
01520d5d77
Dont allow edit or remove of system notes
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-29 15:19:35 +03:00
6f154c07c8
Prevent possible XSS issues by seting text/plain for all text files in
...
RAW feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-28 10:42:52 +03:00
8b00d01c67
Search by issue/mr title and description
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-27 12:47:30 +03:00
1b14864549
Set charset encoding to UTF-8 for snippets
...
Fixes #2678
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-08-16 14:58:53 +02:00
4e40800166
diff unfold
2014-08-14 15:48:14 +04:00
fdd8e45075
Merge branch 'remove-remove-label' into 'master'
...
Remove labels via ajax
See merge request !1019
2014-08-13 18:28:52 +00:00
1d63464c82
Fix repository archive
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-13 21:28:22 +03:00
540596b7b5
Remove labels with ajax request
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-13 19:47:03 +03:00
7122a823f8
Merge pull request #7393 from Razer6/fix_500_hook_service_down
...
Prevent 500 if hook url is down when testing a hook, fixes #7376
2014-08-11 12:41:35 +03:00
2ecc79507a
Order labels by name
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 19:13:35 +03:00
593df8e69a
Improve labels
...
* allow developers to manage labels
* add ability to remove label
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 15:15:39 +03:00
048a21974e
Add create/update to Labels controller
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 13:12:11 +03:00
b2a6f4e136
Refactor label rendering and default label set generation
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 22:19:47 +03:00
Dmitriy Zaporozhets
Ciro Santilli
Valery Sizov
Dmitriy Zaporozhets
Marin Jankovski
Vinnie Okada
Sullivan SENECHAL
Robert Schilling
Sean Edge
Jeroen van Baarsen
skv