Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'split-tests' into 'master' | Dmitriy Zaporozhets | 2015-06-23 | 21 | -65/+61 |
|\ | |||||
| * | Replace GITLAB with GitLab in rake task descriptions | Dmitriy Zaporozhets | 2015-06-23 | 19 | -37/+37 |
| * | Refactor rake tasks for tests | Dmitriy Zaporozhets | 2015-06-23 | 2 | -28/+24 |
* | | Merge branch 'fix-diff-patch-public-mr' into 'master' | Dmitriy Zaporozhets | 2015-06-23 | 2 | -3/+7 |
|\ \ | |/ |/| | |||||
| * | Fix downloading of patches on public merge requests when user logged out | Stan Hu | 2015-06-23 | 2 | -3/+7 |
* | | Merge branch 'admin-edit-identities' into 'master' | Dmitriy Zaporozhets | 2015-06-23 | 1 | -0/+19 |
|\ \ | |||||
| * \ | Merge branch 'master' into admin-edit-identities | Dmitriy Zaporozhets | 2015-06-22 | 3 | -1/+9 |
| |\ \ | | |/ | |||||
| * | | Make provider a select for identities form in admin area | Dmitriy Zaporozhets | 2015-06-22 | 1 | -0/+19 |
* | | | Fix error when deleting a user who has projects | Stan Hu | 2015-06-23 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'nginx_defaulthost_documentation' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 2 | -0/+8 |
|\ \ | |||||
| * | | fixed typo | Luke Ashe-Browne | 2014-12-03 | 1 | -2/+2 |
| * | | adding notes to gitlab nginx conf | Luke Ashe-Browne | 2014-12-03 | 2 | -1/+9 |
* | | | Merge branch 'restore_uploads_fix' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Avoid "cannot copy directory to itself" restore error | Bryan Stearns | 2014-08-03 | 1 | -1/+1 |
* | | | Fix behavior of ldap_person method in Gitlab::OAuth::User | Alex Lossent | 2015-06-17 | 1 | -4/+5 |
* | | | Dont set checkout sha for removed branch/tag | Dmitriy Zaporozhets | 2015-06-15 | 1 | -2/+5 |
* | | | Merge branch 'update_ssl_ciphers' into 'master' | Dmitriy Zaporozhets | 2015-06-15 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update SSL ciphers per logjam vulnerability recommendations.update_ssl_ciphers | Marin Jankovski | 2015-06-15 | 1 | -1/+1 |
* | | | | Add Gitlab::Themes module; remove Gitlab::Theme | Robert Speicher | 2015-06-13 | 2 | -50/+67 |
|/ / / | |||||
* | | | Merge branch 'feature-session-expire-seconds-ui' into 'master' | Douwe Maan | 2015-06-12 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | session_expire_seconds => session_expire_delay | themaze75 | 2015-06-10 | 1 | -1/+1 |
| * | | | Add session expiration delay configuration through UI application | Eric Maziade | 2015-06-05 | 1 | -1/+2 |
* | | | | Merge branch 'note_about_omnibus_changes' into 'master' | Dmitriy Zaporozhets | 2015-06-12 | 2 | -2/+14 |
|\ \ \ \ | |||||
| * | | | | Add a note that changing example configuration files requires changing omnibu...note_about_omnibus_changes | Marin Jankovski | 2015-06-11 | 2 | -2/+14 |
* | | | | | Merge pull request #9371 from zenati/patch-2 | Dmitriy Zaporozhets | 2015-06-11 | 2 | -3/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | An `in_namespace` scope is already present | zenati | 2015-06-09 | 2 | -3/+3 |
* | | | | | Merge branch 'rs-pre-rspec-3' into 'master' | Dmitriy Zaporozhets | 2015-06-10 | 3 | -4/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Define GITORIOUS_HOST only once | Robert Speicher | 2015-06-10 | 3 | -4/+5 |
* | | | | | | Merge branch 'master' into 'master' | Dmitriy Zaporozhets | 2015-06-10 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | use gitlab not gitlabci | Jeroen Nijhof | 2015-06-09 | 1 | -1/+1 |
| * | | | | | update fog to 1.25.0 and add multipart upload support | Jeroen Nijhof | 2015-06-09 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | Revert "No need to check if `repository_ref` is present" | Jeroen van Baarsen | 2015-06-09 | 1 | -1/+5 |
|/ / / / | |||||
* | | | | No need to check if `repository_ref` is present | zenati | 2015-06-08 | 1 | -5/+1 |
* | | | | Merge branch 'refactor-web-editor' into 'master' | Dmitriy Zaporozhets | 2015-06-05 | 1 | -24/+26 |
|\ \ \ \ | |||||
| * | | | | Fix editing files via API | Dmitriy Zaporozhets | 2015-06-05 | 1 | -24/+26 |
* | | | | | Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth' | Douwe Maan | 2015-06-05 | 1 | -3/+60 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Tweak code.cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth | Douwe Maan | 2015-06-05 | 1 | -21/+24 |
| * | | | | Add option to automatically link omniauth and LDAP identities | Alex Lossent | 2015-06-03 | 1 | -4/+58 |
* | | | | | Merge branch 'maser/gitlab-ce-order-commit-comments-in-api' into 'master' | Dmitriy Zaporozhets | 2015-06-05 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Order commit comments in API chronologically | Martin Luder | 2015-05-08 | 1 | -1/+1 |
* | | | | | | Merge branch 'fix-upgrader-script' into 'master' | Dmitriy Zaporozhets | 2015-06-04 | 1 | -3/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix upgrader script | Martins Polakovs | 2015-05-23 | 1 | -3/+8 |
* | | | | | | | Merge branch 'make-namespaces-api-available-to-all-users' into 'master' | Dmitriy Zaporozhets | 2015-06-04 | 1 | -5/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make namespace API available to all users | Stan Hu | 2015-05-28 | 1 | -5/+6 |
* | | | | | | | | Merge branch 'trigger_hooks_create_on_backup_restore' into 'master' | Dmitriy Zaporozhets | 2015-06-04 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Trigger hooks-create on gitlab backup restore. | Marin Jankovski | 2015-06-03 | 1 | -0/+3 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fix-group-remove' into 'master' | Dmitriy Zaporozhets | 2015-06-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'repo-remove' into fix-group-remove | Dmitriy Zaporozhets | 2015-06-03 | 1 | -4/+10 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Wrap group removal into service | Dmitriy Zaporozhets | 2015-06-03 | 1 | -1/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'remove_unecessary_rake_task' into 'master' | Dmitriy Zaporozhets | 2015-06-03 | 2 | -56/+34 |
|\ \ \ \ \ \ \ \ |