summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3006 from jweslley/masterDmitriy Zaporozhets2013-09-292-0/+96
|\ | | | | add rake tasks for web hooks management
| * add help page for web hooks management using rake tasksJonhnny Weslley2013-06-051-0/+31
| |
| * add rake tasks for web hooks managementJonhnny Weslley2013-02-151-0/+65
| |
* | Update databases.mdDenix2013-09-271-0/+3
| | | | | | | | run mysql_secure_installation to secure the freshly installed mysql server
* | Merge pull request #5191 from jojosch/fix-check-script-sidekiqJacob Vosmaer2013-09-271-2/+1
|\ \ | | | | | | [gitlab:check] Fix detecting the status of sidekiq
| * | [gitlab:check] Fix detecting the status of sidekiqJohannes Schleifenbaum2013-09-271-2/+1
|/ / | | | | | | | | | | | | | | | | If you are running another sidekiq instance on your server, e.g. GitLab CI, the check script would parse the output of `ps aux` searching for `sidekiq` and returning success, although the GitLab sidekiq may not be running. Now the `ps` call will only print the processes run by the GitLab user.
* | rewrite issues search test to prevent ajax requests running after testDmitriy Zaporozhets2013-09-272-18/+15
| |
* | Merge branch 'only_one_sidekiq' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-09-271-1/+26
|\ \
| * | Check whether only one sidekiq is runningJacob Vosmaer2013-09-271-1/+26
|/ /
* | Merge branch 'patch-2' of https://github.com/zzet/gitlabhq into zzet-patch-2Dmitriy Zaporozhets2013-09-261-6/+9
|\ \ | | | | | | | | | | | | Conflicts: app/controllers/projects/merge_requests_controller.rb
| * | Update logic for validates_merge_request for tree of MRAndrew Kumanyaev2013-07-311-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | For case: Merge request №1: branch "feature" to "release" and remove "feature" branch Merge request №2: branch "release" to "master" and remove "release" branch Merge request №1 - broken :(
* | | Merge pull request #5192 from zshannon/patch-1Dmitriy Zaporozhets2013-09-261-1/+1
|\ \ \ | | | | | | | | Fixed grammatical mistake in init.d status output.
| * | | Fixed grammatical mistake in init.d status output.Zane Shannon2013-09-261-1/+1
|/ / / | | | | | | "its" not "it's".
* | | Explain on dashboard that limit amount of projects displayedDmitriy Zaporozhets2013-09-263-15/+26
| | |
* | | Dont test 1.9 with travisDmitriy Zaporozhets2013-09-261-1/+0
| | |
* | | Fix issues search testDmitriy Zaporozhets2013-09-262-0/+14
| | |
* | | Add sleep in tests to prevent random failing when next test starts before ↵Dmitriy Zaporozhets2013-09-261-0/+3
| | | | | | | | | | | | ajax requests for old one in progress
* | | Remove issues search rspec since we test it with spinach tooDmitriy Zaporozhets2013-09-262-35/+0
| | |
* | | Merge branch 'refactor/group_owners' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-09-2627-114/+136
|\ \ \
| * | | Mention permissions table on Group#members pageDmitriy Zaporozhets2013-09-261-0/+3
| | | |
| * | | Mention group permissions on Help#permissions pageDmitriy Zaporozhets2013-09-261-0/+50
| | | |
| * | | Ignore owner_id for Group in testsDmitriy Zaporozhets2013-09-268-21/+36
| | | |
| * | | Group ownership completely based on users_groups relation nowDmitriy Zaporozhets2013-09-2612-66/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we have only owner_id to determine group owner With multiple owners per group we should get rid of owner_id in group. So from now @group.owner will always be nil but @group.owners return an actual array of users who can admin this group
| * | | Namespaces.owner_id can be nullDmitriy Zaporozhets2013-09-262-2/+11
| | | |
| * | | Remove project transfer page since we already have multiple owners for groupDmitriy Zaporozhets2013-09-262-22/+1
| | | |
| * | | Group owner or admin can remove other group ownersDmitriy Zaporozhets2013-09-262-3/+3
|/ / /
* | | Group has multiple owners so no sense to show one at dashboard listDmitriy Zaporozhets2013-09-262-5/+8
| | |
* | | Fix remove snippet testDmitriy Zaporozhets2013-09-252-3/+3
| | |
* | | Merge branch '6-1-stable'Dmitriy Zaporozhets2013-09-255-2/+109
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: lib/tasks/gitlab/check.rake
| * \ \ Merge pull request #5174 from johannesbecker/service-pivotaltrackerDmitriy Zaporozhets2013-09-254-1/+81
| |\ \ \ | | | | | | | | | | PivotalTracker Source Commits Endpoint
| | * | | Syntax cleanupJohannes Becker2013-09-251-12/+16
| | | | |
| | * | | Added spinach Tests for pivotaltracker serviceJohannes Becker2013-09-252-0/+20
| | | | |
| | * | | Remove not needed attr_accessibleJohannes Becker2013-09-251-2/+0
| | | | |
| | * | | Simple PivotalTracker Source Commits ServiceJohannes Becker2013-09-252-1/+59
| |/ / /
| * | | Merge pull request #5163 from hiroponz/update-check-script-in-stable-branchDmitriy Zaporozhets2013-09-241-1/+28
| |\ \ \ | | | | | | | | | | Update check script in stable branch
| | * | | Update check scriptHiroyuki Sato2013-09-241-1/+28
| |/ / / | | | | | | | | | | | | | | | | * GitLab Shell 1.7.1 is required * Global projects are not supported (refs #5152)
| * | | Merge pull request #5149 from hiroponz/fix-api-merge-requestDmitriy Zaporozhets2013-09-222-27/+27
| |\ \ \ | | | | | | | | | | Fix API::MergeRequest in 6-1-stable
| | * | | Fix API::MergeRequestHiroyuki Sato2013-09-222-27/+27
| |/ / / | | | | | | | | | | | | Refs #5145
| * | | Merge pull request #5109 from spudstud/6-1-stableDmitriy Zaporozhets2013-09-221-1/+1
| |\ \ \ | | | | | | | | | | Corrects the update document to match the version of gitshell specified ...
| | * | | Corrects the update document to match the version of gitshell specified in ↵Spencer Owen2013-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | the install document (1.7.1)
* | | | | Hide new issue button if not authorizedDmitriy Zaporozhets2013-09-251-3/+4
| | | | |
* | | | | Fixed styling for delete button of snippetDmitriy Zaporozhets2013-09-251-3/+3
| | | | |
* | | | | Tree files use normal font-weightDmitriy Zaporozhets2013-09-252-2/+2
| | | | |
* | | | | Merge pull request #5146 from karlhungus/feature-api-search-for-projects-by-nameDmitriy Zaporozhets2013-09-254-20/+86
|\ \ \ \ \ | | | | | | | | | | | | Added search for projects by name to api
| * | | | | Used pagnation function from api helpersIzaak Alpert2013-09-242-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1bdd3608d3b46924b5da3ae282c99f85ee4e0dab
| * | | | | Added missing API documentationIzaak Alpert2013-09-231-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1337ee7ff51d018d6f62d447345032597e84269f
| * | | | | Added search for projects by name to apiIzaak Alpert2013-09-233-20/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GITLAB-1283 (GITLAB-869) Change-Id: I611e7e93f6292de08e1edc8d3ea77cf9087b6ded Conflicts: config/initializers/1_settings.rb
* | | | | | Hide some filters if current_user is nilDmitriy Zaporozhets2013-09-251-10/+11
| | | | | |
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-09-251-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #4800 from Rovanion/patch-1Jacob Vosmaer2013-09-251-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove -y option when removing ruby1.8
View Lorry Controller Status