Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6717 from pkgr/fix-database-parsing-gitlab-setup | Dmitriy Zaporozhets | 2014-04-08 | 1 | -1/+1 |
|\ | |||||
| * | Allow to parse heroku-generated database.yml config file. | Cyril Rohr | 2014-04-07 | 1 | -1/+1 |
* | | Merge branch 'breack-attack' into 'master' | Dmitriy Zaporozhets | 2014-04-07 | 1 | -2/+5 |
|\ \ | |||||
| * | | Comment gzip: off be default | Dmitriy Zaporozhets | 2014-04-07 | 1 | -4/+4 |
| * | | Disable compression to prevent BREACH attack | Dmitriy Zaporozhets | 2014-04-03 | 1 | -0/+3 |
* | | | Merge branch 'improve-oauth' | Dmitriy Zaporozhets | 2014-04-07 | 1 | -1/+12 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Avoid false validation when create user | Dmitriy Zaporozhets | 2014-04-07 | 1 | -2/+1 |
| * | | Make oauth works for google oauth too | Dmitriy Zaporozhets | 2014-04-07 | 1 | -2/+8 |
| * | | Allow oauth signup without email | Dmitriy Zaporozhets | 2014-04-07 | 1 | -2/+8 |
* | | | Fix popen bug in `rake gitlab:satellites:create` | Jacob Vosmaer | 2014-04-07 | 1 | -5/+2 |
|/ / | |||||
* | | Fix support for force_push | Dmitriy Zaporozhets | 2014-04-03 | 1 | -2/+1 |
* | | Merge pull request #6190 from Popl7/add-better-branch-protection-against-hist... | Dmitriy Zaporozhets | 2014-04-03 | 2 | -9/+16 |
|\ \ | |/ |/| | |||||
| * | first setup to protect protected branched to force updates | Steven Thonus | 2014-03-25 | 2 | -9/+16 |
* | | Use MergeRequest services in API and controllers | Dmitriy Zaporozhets | 2014-04-02 | 1 | -41/+17 |
* | | Merge branch 'reduce-observers' into 'master' | Dmitriy Zaporozhets | 2014-04-02 | 1 | -21/+19 |
|\ \ | |||||
| * | | Move update issue code to separate service | Dmitriy Zaporozhets | 2014-04-02 | 1 | -10/+10 |
| * | | Move code for issue creation to service. | Dmitriy Zaporozhets | 2014-04-02 | 1 | -11/+9 |
* | | | Change the satellites directory permission in the install guide, add to rake ... | Marin Jankovski | 2014-04-02 | 1 | -0/+24 |
* | | | Include the Sidekiq version in gitlab:env:info | Jacob Vosmaer | 2014-04-01 | 1 | -0/+1 |
|/ / | |||||
* | | Create branch via API | Dmitriy Zaporozhets | 2014-04-01 | 2 | -0/+19 |
* | | Move branches api to separate class | Dmitriy Zaporozhets | 2014-03-31 | 4 | -70/+72 |
* | | Merge pull request #5469 from NARKOZ/api-pagination-headers | Dmitriy Zaporozhets | 2014-03-31 | 1 | -2/+18 |
|\ \ | |||||
| * | | add 'Link' header for API response | Nihad Abbasov | 2013-10-29 | 1 | -2/+18 |
* | | | Make the repository downloads path configurable | Jacob Vosmaer | 2014-03-31 | 1 | -1/+1 |
* | | | Merge pull request #6317 from jirutka/fix-ldap-dn-case | Dmitriy Zaporozhets | 2014-03-29 | 1 | -1/+6 |
|\ \ \ | |||||
| * | | | Fix searching by extern_uid for LDAP to be case-insensitive | Jakub Jirutka | 2014-02-18 | 1 | -1/+6 |
* | | | | Merge remote-tracking branch 'origin/rake_drop_tables' | Dmitriy Zaporozhets | 2014-03-28 | 2 | -2/+13 |
|\ \ \ \ | |||||
| * | | | | Drop all tables before restoring a PostgreSQL DB | Jacob Vosmaer | 2014-03-28 | 1 | -2/+3 |
| * | | | | Add a rake task that drops all tables | Jacob Vosmaer | 2014-03-28 | 1 | -0/+10 |
* | | | | | Use omniauth nickname as the username for LDAP | Jacob Vosmaer | 2014-03-28 | 1 | -5/+1 |
|/ / / / | |||||
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2014-03-27 | 1 | -5/+5 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'bugfix/fix_unicorn-sidekiq_confusion_in_gitlab_init_script' in... | Jacob Vosmaer | 2014-03-26 | 1 | -5/+5 |
| |\ \ \ \ | |||||
| | * | | | | Fixed Unicorn-Sidekiq confusion in GitLab init script. | Kyle Fazzari | 2014-03-08 | 1 | -5/+5 |
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-03-27 | 1 | -11/+11 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #6222 from nickryand/background_init | Jacob Vosmaer | 2014-03-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Removed the backgrounding of the unicorn_rails webapp start call. | Nick Downs | 2014-03-25 | 1 | -1/+1 |
| * | | | | | | | Init script - change start() stop() restart() reload() to xxxx_gitlab() | Pawel Krzaczkowski | 2014-03-26 | 1 | -10/+10 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Ldap check recognize ldap user filter. | Marin Jankovski | 2014-03-26 | 1 | -1/+14 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #6569 from criteo/api_merge_request_comments | Dmitriy Zaporozhets | 2014-03-26 | 1 | -0/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add method to get the comments on a merge request | Stuart Pook | 2014-03-19 | 1 | -0/+16 |
* | | | | | | | Add to changelog. | Marin Jankovski | 2014-03-25 | 1 | -1/+1 |
* | | | | | | | Allow referencing an existing user. | Marin Jankovski | 2014-03-25 | 1 | -2/+2 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge pull request #6586 from abner/master | Dmitriy Zaporozhets | 2014-03-25 | 2 | -0/+15 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | changed doc comment for get labels of a project | Ábner Silva de Oliveira | 2014-03-23 | 1 | -2/+4 |
| * | | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhq | Ábner Silva de Oliveira | 2014-03-22 | 4 | -27/+40 |
| |\ \ \ \ \ | |||||
| * | | | | | | added api method to return labels of a given project | Ábner Silva de Oliveira | 2014-03-21 | 2 | -0/+13 |
* | | | | | | | Merge pull request #5935 from nmoura/patch-1 | Jacob Vosmaer | 2014-03-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Changed sudo by su -c | Nilton Moura | 2013-12-26 | 1 | -1/+1 |
* | | | | | | | | Add gzip compression for assets to nginx example. | Marin Jankovski | 2014-03-24 | 1 | -0/+8 |
* | | | | | | | | Remove code that does nothing | Robert Speicher | 2014-03-22 | 1 | -1/+0 |