summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'breack-attack' into 'master'Dmitriy Zaporozhets2014-04-071-2/+5
|\
| * Comment gzip: off be defaultDmitriy Zaporozhets2014-04-071-4/+4
| * Disable compression to prevent BREACH attackDmitriy Zaporozhets2014-04-031-0/+3
* | Merge branch 'improve-oauth'Dmitriy Zaporozhets2014-04-071-1/+12
|\ \
| * | Avoid false validation when create userDmitriy Zaporozhets2014-04-071-2/+1
| * | Make oauth works for google oauth tooDmitriy Zaporozhets2014-04-071-2/+8
| * | Allow oauth signup without emailDmitriy Zaporozhets2014-04-071-2/+8
* | | Fix popen bug in `rake gitlab:satellites:create`Jacob Vosmaer2014-04-071-5/+2
|/ /
* | Fix support for force_pushDmitriy Zaporozhets2014-04-031-2/+1
* | Merge pull request #6190 from Popl7/add-better-branch-protection-against-hist...Dmitriy Zaporozhets2014-04-032-9/+16
|\ \ | |/ |/|
| * first setup to protect protected branched to force updatesSteven Thonus2014-03-252-9/+16
* | Use MergeRequest services in API and controllersDmitriy Zaporozhets2014-04-021-41/+17
* | Merge branch 'reduce-observers' into 'master'Dmitriy Zaporozhets2014-04-021-21/+19
|\ \
| * | Move update issue code to separate serviceDmitriy Zaporozhets2014-04-021-10/+10
| * | Move code for issue creation to service.Dmitriy Zaporozhets2014-04-021-11/+9
* | | Change the satellites directory permission in the install guide, add to rake ...Marin Jankovski2014-04-021-0/+24
* | | Include the Sidekiq version in gitlab:env:infoJacob Vosmaer2014-04-011-0/+1
|/ /
* | Create branch via APIDmitriy Zaporozhets2014-04-012-0/+19
* | Move branches api to separate classDmitriy Zaporozhets2014-03-314-70/+72
* | Merge pull request #5469 from NARKOZ/api-pagination-headersDmitriy Zaporozhets2014-03-311-2/+18
|\ \
| * | add 'Link' header for API responseNihad Abbasov2013-10-291-2/+18
* | | Make the repository downloads path configurableJacob Vosmaer2014-03-311-1/+1
* | | Merge pull request #6317 from jirutka/fix-ldap-dn-caseDmitriy Zaporozhets2014-03-291-1/+6
|\ \ \
| * | | Fix searching by extern_uid for LDAP to be case-insensitiveJakub Jirutka2014-02-181-1/+6
* | | | Merge remote-tracking branch 'origin/rake_drop_tables'Dmitriy Zaporozhets2014-03-282-2/+13
|\ \ \ \
| * | | | Drop all tables before restoring a PostgreSQL DBJacob Vosmaer2014-03-281-2/+3
| * | | | Add a rake task that drops all tablesJacob Vosmaer2014-03-281-0/+10
* | | | | Use omniauth nickname as the username for LDAPJacob Vosmaer2014-03-281-5/+1
|/ / / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-03-271-5/+5
|\ \ \ \
| * \ \ \ Merge branch 'bugfix/fix_unicorn-sidekiq_confusion_in_gitlab_init_script' in...Jacob Vosmaer2014-03-261-5/+5
| |\ \ \ \
| | * | | | Fixed Unicorn-Sidekiq confusion in GitLab init script.Kyle Fazzari2014-03-081-5/+5
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-271-11/+11
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #6222 from nickryand/background_initJacob Vosmaer2014-03-261-1/+1
| |\ \ \ \ \ \
| | * | | | | | Removed the backgrounding of the unicorn_rails webapp start call.Nick Downs2014-03-251-1/+1
| * | | | | | | Init script - change start() stop() restart() reload() to xxxx_gitlab()Pawel Krzaczkowski2014-03-261-10/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Ldap check recognize ldap user filter.Marin Jankovski2014-03-261-1/+14
|/ / / / / /
* | | | | | Merge pull request #6569 from criteo/api_merge_request_commentsDmitriy Zaporozhets2014-03-261-0/+16
|\ \ \ \ \ \
| * | | | | | Add method to get the comments on a merge requestStuart Pook2014-03-191-0/+16
* | | | | | | Add to changelog.Marin Jankovski2014-03-251-1/+1
* | | | | | | Allow referencing an existing user.Marin Jankovski2014-03-251-2/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #6586 from abner/masterDmitriy Zaporozhets2014-03-252-0/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | changed doc comment for get labels of a projectÁbner Silva de Oliveira2014-03-231-2/+4
| * | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqÁbner Silva de Oliveira2014-03-224-27/+40
| |\ \ \ \ \
| * | | | | | added api method to return labels of a given projectÁbner Silva de Oliveira2014-03-212-0/+13
* | | | | | | Merge pull request #5935 from nmoura/patch-1Jacob Vosmaer2014-03-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Changed sudo by su -cNilton Moura2013-12-261-1/+1
* | | | | | | | Add gzip compression for assets to nginx example.Marin Jankovski2014-03-241-0/+8
* | | | | | | | Remove code that does nothingRobert Speicher2014-03-221-1/+0
* | | | | | | | Default message for SatelliteNotExistErrorRobert Speicher2014-03-221-8/+8
| |_|/ / / / / |/| | | | | |
* | | | | | | Fix upgraderDmitriy Zaporozhets2014-03-211-0/+1