Commit Graph
9081 Commits
Author SHA1 Message Date
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
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
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
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 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
Dmitriy Zaporozhets 09d24a1f67 Better title suggestion for new MR
Ex. if branch named "refactor-models" then title will be "Refactor models"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 14:16:37 +03:00
Dmitriy Zaporozhets 3a959a68ec Remove unused gems
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 14:11:55 +03:00
Marin Jankovski b06f43288a Pass the required parameters on search submit. 2014-04-02 12:26:09 +02:00
Dmitriy Zaporozhets 973f9d30d9 Merge branch 'pin_sidekiq_version' into 'master'
Pin gem sidekiq version
2014-04-01 18:15:24 +00:00
Dmitriy Zaporozhets f8b5429599 Merge branch 'honor_notification_level' into 'master'
Honor notification levels

Fixes #1093
2014-04-01 18:13:56 +00:00
Marin Jankovski f732e6c8da Pin sidekiq version to 2.17.0. 2014-04-01 18:37:45 +02:00
Dmitriy Zaporozhets a37f8fc6db Merge branch 'new_sidekiq_cli_syntax' into 'master'
New Sidekiq CLI syntax
2014-04-01 16:27:54 +00:00
Marin Jankovski 109ab1a58b Add comments, fix style, better names for notification methods. 2014-04-01 17:18:52 +02:00
Marin Jankovski 528a641e9e Use group notification settings while honoring project settings. 2014-04-01 17:18:52 +02:00
Marin Jankovski ce30a56f33 Add or remove watchers from list based on their notification settings. 2014-04-01 17:18:52 +02:00
Marin Jankovski f4f0a7e03e Add a failing test. 2014-04-01 17:18:52 +02:00
Sytse Sijbrandij 69432c885c Merge branch 'jira_issue_reference' into 'master'
Explain how to refer to JIRA issues
2014-04-01 15:11:12 +00:00
Sytse Sijbrandij 603bcfcbff Merge branch 'sidekiq_version_in_env_info' into 'master'
Show Sidekiq version in gitlab:env:info
2014-04-01 15:10:48 +00:00
Marc RadulescuandJacob Vosmaer cf788f3d97 fix JIRA documentation by explaining how to reference JIRA issues in GitLab comments 2014-04-01 17:03:58 +02:00
Jacob Vosmaer 03b14bb814 Use the new Sidekiq syntax to specify queues
This syntax is compatible with the current Sidekiq version we use
(2.17.0) and it protects us against future breakage by
https://github.com/mperham/sidekiq/commit/040eda558bc64139c846c781d3de0b79603e3035
2014-04-01 16:46:27 +02:00
Jacob Vosmaer bbea1d1a72 Include the Sidekiq version in gitlab:env:info 2014-04-01 16:05:26 +02:00
Dmitriy Zaporozhets 3b0510a7c1 Use ruby 1.9 hash syntax in Guardfile
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-01 13:08:16 +03:00
Dmitriy Zaporozhets 24ea884fab add spring to guard
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-01 12:30:07 +03:00
Dmitriy Zaporozhets 9be05a430b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-04-01 12:28:21 +03:00
Dmitriy Zaporozhets 1069ffb873 Merge branch 'branch-via-api' into 'master'
Create branch via API

Fixes #1096
2014-04-01 09:27:46 +00:00
Dmitriy Zaporozhets 2d3d210b64 Merge branch 'user-search' into 'master'
User-search
2014-04-01 09:25:41 +00:00
Dmitriy Zaporozhets 27ceb6be0d Merge branch 'deploy-key-doc-improvement' into 'master'
Deploy-key-doc-improvement
2014-04-01 09:12:45 +00:00
dosire 9ae11007fe Mention search options. 2014-04-01 10:41:57 +02:00
dosire 799361a389 SSH section was missing in doc and corrected the deploy key section. 2014-04-01 10:28:55 +02:00
Dmitriy Zaporozhets a88225b768 Update changelog with new feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-01 10:45:10 +03:00
Dmitriy Zaporozhets d7afdab7a5 Add docs for create branch via api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-01 10:44:58 +03:00
Dmitriy Zaporozhets 33a00ceeea Create branch via API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-01 10:39:53 +03:00
Dmitriy Zaporozhets 95b84e2c5a Move branch creation logic in service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-01 10:33:23 +03:00
Dmitriy Zaporozhets b98bd5c8d0 Merge branch 'link-to-doc-site' into 'master'
Link-to-doc-site
2014-04-01 07:29:40 +00:00
dosire 230335650d Link to doc site from the readme. 2014-04-01 09:19:37 +02:00
Sytse Sijbrandij a9af2e5d83 Merge pull request #6667 from Razer6/update_workflow_doc
Improve doc/workflow.md for doc.gitlab.com
2014-03-31 21:35:15 +02:00
Sytse Sijbrandij e5a0713f0e Merge branch 'hyphens-in-doc-filename' into 'master'
Hyphens-in-doc-filename
2014-03-31 16:23:49 +00:00
dosire f6189a9f07 Use underscores in doc filename like elsewhere. 2014-03-31 18:23:10 +02:00
Robert Schilling 2496f85d46 Fix rendering for enumeration for doc page 2014-03-31 18:10:20 +02:00
Dmitriy Zaporozhets 83941ca208 Merge branch 'pagination-link-header-doc' into 'master'
Pagination-link-header-doc
2014-03-31 16:04:28 +00:00
Dmitriy Zaporozhets 9fdc6e9700 Merge branch 'typo-in-docs' into 'master'
Typo-in-docs
2014-03-31 16:04:08 +00:00
Sytse Sijbrandij dfc92cd25d Merge pull request #6663 from Razer6/fix_integration_link
Fix link to isue tracker integration page
2014-03-31 17:39:51 +02:00
Dmitriy Zaporozhets bd1b15ec29 Merge branch 'branch-via-api' into 'master'
Refactor branches API

Preparing for new feature: Create branches via API
2014-03-31 14:46:57 +00:00