summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3006 from jweslley/masterDmitriy Zaporozhets2013-09-291-0/+65
|\ | | | | add rake tasks for web hooks management
| * add rake tasks for web hooks managementJonhnny Weslley2013-02-151-0/+65
| |
* | [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.
* | Check whether only one sidekiq is runningJacob Vosmaer2013-09-271-1/+26
| |
* | Fixed grammatical mistake in init.d status output.Zane Shannon2013-09-261-1/+1
| | | | | | "its" not "it's".
* | Merge branch '6-1-stable'Dmitriy Zaporozhets2013-09-251-1/+28
|\ \ | | | | | | | | | | | | Conflicts: lib/tasks/gitlab/check.rake
| * | Update check scriptHiroyuki Sato2013-09-241-1/+28
| | | | | | | | | | | | | | | * GitLab Shell 1.7.1 is required * Global projects are not supported (refs #5152)
| * | Fix API::MergeRequestHiroyuki Sato2013-09-221-1/+1
| | | | | | | | | | | | Refs #5145
* | | Merge pull request #5146 from karlhungus/feature-api-search-for-projects-by-nameDmitriy Zaporozhets2013-09-251-19/+32
|\ \ \ | | | | | | | | Added search for projects by name to api
| * | | Used pagnation function from api helpersIzaak Alpert2013-09-241-6/+4
| | | | | | | | | | | | | | | | Change-Id: I1bdd3608d3b46924b5da3ae282c99f85ee4e0dab
| * | | Added search for projects by name to apiIzaak Alpert2013-09-231-19/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GITLAB-1283 (GITLAB-869) Change-Id: I611e7e93f6292de08e1edc8d3ea77cf9087b6ded Conflicts: config/initializers/1_settings.rb
* | | | Add gitlab-shell/bin/check to rake gitlab:checkJacob Vosmaer2013-09-241-0/+18
|/ / / | | | | | | | | | | | | | | | | | | We sometimes encounter connectivity issues where gitlab-shell cannot make API calls to the Rails application. There is a self-test script `gitlab-shell/bin/check` that tries to connect to the API; this commit runs that script as part of `rake gitlab:check`.
* | | Update for readabilityIzaak Alpert2013-09-221-3/+7
| | | | | | | | | | | | | | | fixed a test a broke in the configurable theme PR Change-Id: Id894506941bc01ab0d259d48ca7ff9b80bb2c57e
* | | Allows username only updates to ldap propertiesIzaak Alpert2013-09-221-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | -when logging in if users are allowed to login with just usernames in ldap we will update uid of the user if their uid is out of date Conflicts: spec/lib/auth_spec.rb Change-Id: Ia171b3d5133da86edc18c0d08ecfaf6a174f2574
* | | Fix API::MergeRequestHiroyuki Sato2013-09-221-1/+1
|/ / | | | | | | Fixes #5144 Refs #4996
* | Merge pull request #4996 from hiroponz/drop-support-of-root-namespaceDmitriy Zaporozhets2013-09-141-1/+1
|\ \ | | | | | | [WIP]Drop support of root namespace in routing
| * | Drop support of root namespace in routingHiroyuki Sato2013-09-131-1/+1
| | |
* | | Remove code that was accidently added in ↵Dmitriy Zaporozhets2013-09-141-66/+0
|/ / | | | | | | 5dae40f579f66fdc060de633b183ede7bd8b2ce4
* | Rescue an error if group doesn't existMarin Jankovski2013-09-122-3/+9
| |
* | Removed private scopeIzaak Alpert2013-09-111-1/+1
| | | | | | | | Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0
* | Update to only provide one way to get a default userIzaak Alpert2013-09-112-3/+68
| | | | | | | | | | | | -calling build_user will now apply defaults and only override them if as: :admin is set Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
* | Update User api to respect default settingsIzaak Alpert2013-09-111-1/+1
| | | | | | | | | | | | -API now respects default_projects_limit, default_can_create_group, and default_can_create_team Change-Id: I059d060d576df1050e5371e707381c5e8c608a7a
* | Merge pull request #5012 from jeffb-bt/masterJacob Vosmaer2013-09-111-1/+1
|\ \ | | | | | | -i flag allows sudo to work for git users using rvm that is not being us...
| * | -i flag allows sudo to work for git users using rvm that is not being used byJeff '2 bits' Bachtel2013-09-061-1/+1
| | | | | | | | | | | | root user (su might be better)
* | | Some of the requested updates, rebase on masterIzaak Alpert2013-09-091-15/+8
| | | | | | | | | | | | Change-Id: I305266fe9acbbb5136adeeb52e7e4e1d6629a30a
* | | API: admin users can sudo commands as other usersIzaak Alpert2013-09-091-5/+39
| | | | | | | | | | | | -Specifying a header of SUDO or adding a :sudo with either user id, or username of the user will set the current_user to be that user if your identifying private_token/PRIVATE_TOKEN is an administrator token
* | | Forgot to fix the comment instructions.C. Walker2013-09-061-1/+1
| | |
* | | Fixed description.C. Walker2013-09-061-1/+1
|/ /
* | Merge pull request #4990 from karlhungus/feature_group_membership_apiDmitriy Zaporozhets2013-09-052-6/+74
|\ \ | | | | | | Add group membership api
| * | Fixes for @randxIzaak Alpert2013-09-051-3/+4
| | | | | | | | | | | | Change-Id: I3b15ae34c0957a0f4026e1886c92a9770e9d170e
| * | Add group membership apiIzaak Alpert2013-09-042-6/+73
| | | | | | | | | | | | Change-Id: I5b174bba02856ede788dcb51ec9b0d598ea7d0df
* | | Improve commit diffDmitriy Zaporozhets2013-09-041-2/+14
|/ / | | | | | | | | * show highlights when replace empty line with content * show inline diff when replace line with spaces with content
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-09-041-1/+1
|\ \
| * \ Merge pull request #4969 from Razer6/update_path_blacklistDmitriy Zaporozhets2013-09-031-1/+1
| |\ \ | | | | | | | | Add 'notes' to path blacklist, fixes #4967
| | * | Add 'notes' to path blacklist, fixes #4967Robert Schilling2013-09-031-1/+1
| | | |
* | | | Merge branch 'refactor/oauth' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-09-045-108/+167
|\ \ \ \ | |/ / / |/| | |
| * | | Refactor Gitlab::AuthDmitriy Zaporozhets2013-09-041-54/+1
| | | |
| * | | Inherit Gitlab::LDAP::User from Gitlab::OAuth::UserDmitriy Zaporozhets2013-09-041-67/+33
| | | |
| * | | Added Gitlab::OAuth::User classDmitriy Zaporozhets2013-09-041-0/+85
| | | | | | | | | | | | | | | | Authenticate or create users from OAuth providers
| * | | Remove include of grack_ldapDmitriy Zaporozhets2013-09-021-2/+0
| | | |
| * | | Move ldap auth to LDAP::User. Removed unused codeDmitriy Zaporozhets2013-09-023-40/+28
| | | |
| * | | Mode User+LDAP functionality from Gitlab::AuthDmitriy Zaporozhets2013-09-022-17/+92
| |/ /
* | | Merge pull request #4920 from Rovanion/init-rewriteJacob Vosmaer2013-09-031-77/+201
|\ \ \ | |/ / |/| | Rewrote init script.
| * | Made script path flexibleRovanion2013-09-031-1/+1
| | |
| * | Restart works again, grammar mistakes corrected.Rovanion2013-08-291-5/+16
| | |
| * | Fixed failure to stop and added handling of failure to remove stale pidRovanion2013-08-281-7/+17
| | |
| * | Corrections suggested by jacobvosmaerRovanion2013-08-281-8/+15
| | |
| * | Changes recommended by @axilleasRovanion2013-08-271-5/+5
| | |
| * | Rewrote init script.Rovanion2013-08-271-78/+174
| | |
* | | Merge pull request #4906 from alexvh/standardize_diff_api_urlDmitriy Zaporozhets2013-08-291-4/+20
|\ \ \ | | | | | | | | Standardize recently added commit diff api url
View Lorry Controller Status