summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5950 from axilleas/bundler_parallelDmitriy Zaporozhets2014-04-041-0/+7
|\ | | | | Refer to bundler's ability of parallel installation
| * Refer to bundler's ability of parallel installationAchilleas Pipinellis2014-03-261-0/+7
| |
* | Merge pull request #6658 from tsigo/rs-important-dirsDmitriy Zaporozhets2014-04-044-9/+6
|\ \ | | | | | | Make sure important directories exist in git
| * | Remove Install doc notes about creating certain foldersRobert Speicher2014-03-301-9/+6
| | |
| * | Make sure important directories exist in gitRobert Speicher2014-03-303-0/+0
| | | | | | | | | | | | | | | | | | | | | Ensures the following directories exist after a git clone: - public/uploads - tmp/pids - tmp/sockets
* | | Merge branch 'no_email_on_notification_level_change' into 'master'Dmitriy Zaporozhets2014-04-042-2/+2
|\ \ \ | | | | | | | | | | | | Don't send emails on notification level change
| * | | Fix user_project observer test.Marin Jankovski2014-04-031-1/+1
| | | |
| * | | Only send email when project access level changes.Marin Jankovski2014-04-031-1/+1
| | | |
* | | | Merge branch 'add-one-line-upgrader-command' into 'master'Marin Jankovski2014-04-041-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add One Line Upgrader Command This is related to my previous MR from one month ago. I've done a fresh checkout of master and reapplied the path so that the tree is clean again, as requested.
| * | | | Add one line upgrade command.Remy van Elst2014-04-041-0/+7
| | | | |
* | | | | Merge branch 'update_update_guides' into 'master'Sytse Sijbrandij2014-04-043-1/+7
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Add to update guides satellites group permission.
| * | | | Add to update guides satellites group permission.Marin Jankovski2014-04-043-1/+7
|/ / / /
* | | | Merge branch 'improve-mr-services' into 'master'Dmitriy Zaporozhets2014-04-034-0/+108
|\ \ \ \ | | | | | | | | | | | | | | | Improve MR services
| * | | | Add note when MR assignee changes. Add more tests to MR servicesDmitriy Zaporozhets2014-04-034-0/+108
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Mention protected branch force pushDmitriy Zaporozhets2014-04-032-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix support for force_pushDmitriy Zaporozhets2014-04-031-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #6190 from ↵Dmitriy Zaporozhets2014-04-032-9/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Popl7/add-better-branch-protection-against-history-rewrite-and-deletion protect protected branched to force updates
| * | | | first setup to protect protected branched to force updatesSteven Thonus2014-03-252-9/+16
| | | | |
* | | | | Merge branch 'specific-warning-for-version-managers' into 'master'Dmitriy Zaporozhets2014-04-031-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | Specific-warning-for-version-managers
| * | | | More explicit warning since we still see many people running into problems ↵dosire2014-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | with this.
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-032-4/+4
|\ \ \ \ \
| * \ \ \ \ Merge pull request #6639 from yatish27/ConsistentJSFormatDmitriy Zaporozhets2014-04-032-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | Consistent format for class objects in javascript
| | * | | | | Consistent format for class objects in javascriptYatish Mehta2014-03-282-4/+4
| | | | | | |
* | | | | | | Merge branch 'reduce-observers' into 'master'Dmitriy Zaporozhets2014-04-0327-335/+214
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove some observers
| * | | | | | | More test fixesDmitriy Zaporozhets2014-04-033-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix tests that dont respect project-fork relation. pt2Dmitriy Zaporozhets2014-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix tests that dont respect project-fork relationDmitriy Zaporozhets2014-04-032-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix MR fork validation and services loadDmitriy Zaporozhets2014-04-035-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Use MergeRequest services in API and controllersDmitriy Zaporozhets2014-04-025-67/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | MergeRequest services for create, update, close and reopenDmitriy Zaporozhets2014-04-025-0/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Remove MergeRequest observerDmitriy Zaporozhets2014-04-023-175/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Remove KeysObserverDmitriy Zaporozhets2014-04-025-43/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Remove email observer specsDmitriy Zaporozhets2014-04-021-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Remove EmailsObserverDmitriy Zaporozhets2014-04-022-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'annotated-tag' into 'master'Dmitriy Zaporozhets2014-04-032-3/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | Annotated tag
| * | | | | | | Specify that the tag should be annotated.dosire2014-04-032-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'update-changelog' into 'master'Dmitriy Zaporozhets2014-04-031-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | Update changelog
| * | | | | | | Update changelog in master.dosire2014-04-031-0/+5
|/ / / / / / /
* | | | | | | Merge branch 'modernizr_gem' into 'master'Dmitriy Zaporozhets2014-04-033-5/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | Remove Modernizr gem
| * | | | | | Do not require modernizr.Marin Jankovski2014-04-031-1/+0
| | | | | | |
| * | | | | | Remove modernizr gem.Marin Jankovski2014-04-032-4/+0
|/ / / / / /
* | | | | | Merge branch 'reduce-observers' into 'master'Dmitriy Zaporozhets2014-04-0216-183/+237
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move issue create/update code to services Reduce observers role in GitLab code
| * | | | | | Fix testsDmitriy Zaporozhets2014-04-025-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | More tests for Isses servicesDmitriy Zaporozhets2014-04-022-2/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Fix assignee change in Issues::UpdateServiceDmitriy Zaporozhets2014-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Remove issue observer testsDmitriy Zaporozhets2014-04-021-99/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Add support for close/reopen actions in update serviceDmitriy Zaporozhets2014-04-022-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Create services for issue close and reopenDmitriy Zaporozhets2014-04-025-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Remove issue observerDmitriy Zaporozhets2014-04-022-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Move update issue code to separate serviceDmitriy Zaporozhets2014-04-028-28/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>