Commit Graph
9126 Commits
Author SHA1 Message Date
Marin Jankovski 04324908fb Add to update guides satellites group permission. 2014-04-04 09:36:25 +02:00
Dmitriy Zaporozhets 49a5159946 Merge branch 'improve-mr-services' into 'master'
Improve MR services
2014-04-03 16:43:30 +00:00
Dmitriy Zaporozhets 860f159d41 Add note when MR assignee changes. Add more tests to MR services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-03 18:16:05 +03:00
Dmitriy Zaporozhets 8cc5e85543 Mention protected branch force push
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-03 17:06:11 +03:00
Dmitriy Zaporozhets 5350492842 Fix support for force_push
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-03 15:03:45 +03:00
Dmitriy Zaporozhets 207f34b890 Merge pull request #6190 from Popl7/add-better-branch-protection-against-history-rewrite-and-deletion
protect protected branched to force updates
2014-04-03 14:33:34 +03:00
Dmitriy Zaporozhets 6594ce1de0 Merge branch 'specific-warning-for-version-managers' into 'master'
Specific-warning-for-version-managers
2014-04-03 11:28:31 +00:00
Dmitriy Zaporozhets 1eec1f4f20 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-04-03 12:56:09 +03:00
Dmitriy Zaporozhets a7ab029d22 Merge branch 'reduce-observers' into 'master'
Remove some observers
2014-04-03 09:55:46 +00:00
Dmitriy Zaporozhets 9b6224f99c More test fixes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-03 12:05:21 +03:00
Dmitriy Zaporozhets e1dd76d5a5 Fix tests that dont respect project-fork relation. pt2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-03 11:49:12 +03:00
Dmitriy Zaporozhets c31b703110 Fix tests that dont respect project-fork relation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-03 11:47:56 +03:00
Dmitriy Zaporozhets 96f91c0f2a Merge branch 'annotated-tag' into 'master'
Annotated tag
2014-04-03 08:39:17 +00:00
Dmitriy Zaporozhets 76c4421b26 Merge pull request #6639 from yatish27/ConsistentJSFormat
Consistent format for class objects in javascript
2014-04-03 11:36:44 +03:00
Dmitriy Zaporozhets 9c6e5eab11 Merge branch 'update-changelog' into 'master'
Update changelog
2014-04-03 08:15:42 +00:00
dosire fa27b633f8 Update changelog in master. 2014-04-03 10:13:14 +02:00
dosire 770747af68 Specify that the tag should be annotated. 2014-04-03 10:09:52 +02:00
Dmitriy Zaporozhets ca1d31f8cd Merge branch 'modernizr_gem' into 'master'
Remove Modernizr gem
2014-04-03 07:42:38 +00:00
Dmitriy Zaporozhets 9b598fa62d Fix MR fork validation and services load
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-03 10:36:10 +03:00
Marin Jankovski 7ab46b969f Do not require modernizr. 2014-04-03 08:49:34 +02:00
Marin Jankovski 14ac074671 Remove modernizr gem. 2014-04-03 08:43:40 +02:00
Dmitriy Zaporozhets 9ee697dd68 Use MergeRequest services in API and controllers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 21:51:53 +03:00
Dmitriy Zaporozhets 3c867dfa8e MergeRequest services for create, update, close and reopen
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 21:51:17 +03:00
Dmitriy Zaporozhets 65cd9829ee Remove MergeRequest observer
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 21:35:59 +03:00
Dmitriy Zaporozhets 6ae2529041 Remove KeysObserver
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 21:13:05 +03:00
Dmitriy Zaporozhets 77c0a6db4b Remove email observer specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 21:03:31 +03:00
Dmitriy Zaporozhets 599344583b Remove EmailsObserver
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 21:02:02 +03:00
Dmitriy Zaporozhets 3faa14e7a7 Merge branch 'reduce-observers' into 'master'
Move issue create/update code to services

Reduce observers role in GitLab code
2014-04-02 17:54:27 +00:00
Dmitriy Zaporozhets a23d0ef98e Merge branch 'readable-doc-readme' into 'master'
Readable-doc-readme

This prepares the doc readme for inclusion on the help page and gives it sections so you can quickly find the relevant part.
2014-04-02 17:02:04 +00:00
Dmitriy Zaporozhets 49f977d675 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 19:55:23 +03:00
dosire b8ea26f7a6 Merge branch 'master' into readable-doc-readme
Conflicts:
	doc/README.md
2014-04-02 17:45:10 +02:00
Dmitriy Zaporozhets dc8bd60707 Merge branch 'satellites_permission' into 'master'
Update satellites directory permissions
2014-04-02 15:30:26 +00:00
Dmitriy Zaporozhets 2ab53dfb1c Merge branch 'issue_search_filter' into 'master'
Fix reset of issue search on submit
2014-04-02 15:30:13 +00:00
Sytse Sijbrandij 03f741be42 Merge branch 'project-feature-doc' into 'master'
Add Project Features to doc/workflow

Fixes #1123
2014-04-02 14:50:15 +00:00
Job van der Voort 3acad539be workflow index; newlines; small description 2014-04-02 16:15:55 +02:00
dosire 80bc7c4ca5 More explicit warning since we still see many people running into problems with this. 2014-04-02 16:10:53 +02:00
Dmitriy Zaporozhets 62743b1525 Merge branch 'print_layout_to_assets' into 'master'
Add print css to precompile list
2014-04-02 14:06:34 +00:00
Dmitriy Zaporozhets ea347323c9 Merge branch 'fix-jquery-assets' into 'master'
Replace custom jquery css with native one.

Fixes wrong assets path for calendar in production
2014-04-02 14:04:36 +00:00
Dmitriy Zaporozhets e23d58dcb9 Merge branch 'improve-mr-suggestion' into 'master'
Better title suggestion for new MR
2014-04-02 13:40:51 +00:00
Dmitriy Zaporozhets 7b96e35309 Merge branch 'remove-unused-gems' into 'master'
Remove unused gems
2014-04-02 13:40:36 +00:00
Dmitriy Zaporozhets 928fbeeec0 More tests for Isses services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 16:33:07 +03:00
Marin Jankovski 03b8dcce87 Change the satellites directory permission in the install guide, add to rake check task. 2014-04-02 15:25:26 +02:00
Dmitriy Zaporozhets 1b5fb4ac21 Fix assignee change in Issues::UpdateService
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 16:08:49 +03:00
Dmitriy Zaporozhets 7d8d9bd1a1 Remove issue observer tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 15:51:37 +03:00
Dmitriy Zaporozhets ed67ba9663 Add support for close/reopen actions in update service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 15:50:50 +03:00
Job van der Voort c66c84a40d add project features to doc/workflow 2014-04-02 14:45:59 +02:00
Marin Jankovski 1ad79393ad Add print.css to asset precompile array. 2014-04-02 14:42:35 +02:00
Dmitriy Zaporozhets cc77365488 Create services for issue close and reopen
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 15:38:24 +03:00
Dmitriy Zaporozhets 0d41f6f0a3 Remove issue observer
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 15:37:57 +03:00
Dmitriy Zaporozhets f38eddc69e Replace custom jquery css with native one. Fixes wrong assets path for calendar in production
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 14:57:00 +03:00