summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '1791-fix-github-issue-order' into 'master'Stan Hu2015-06-291-1/+3
|\
| * Fix wrong order of issues when importing from githubHiroyuki Sato2015-06-281-1/+3
* | Remove jasmine:ci task, execute teaspoon directly on CIrs-update-gitlab-ciRobert Speicher2015-06-281-12/+0
|/
* Merge branch 'rename-abilities' into 'master'Dmitriy Zaporozhets2015-06-264-7/+7
|\
| * Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-264-7/+7
* | Only people who can manage issue can assign labels to itpermission-improvementsDmitriy Zaporozhets2015-06-261-1/+1
|/
* Add 2FA status to user admin APIStan Hu2015-06-231-0/+1
* Merge branch 'split-tests' into 'master'Dmitriy Zaporozhets2015-06-2321-65/+61
|\
| * Replace GITLAB with GitLab in rake task descriptionsDmitriy Zaporozhets2015-06-2319-37/+37
| * Refactor rake tasks for testsDmitriy Zaporozhets2015-06-232-28/+24
* | Merge branch 'fix-diff-patch-public-mr' into 'master'Dmitriy Zaporozhets2015-06-232-3/+7
|\ \ | |/ |/|
| * Fix downloading of patches on public merge requests when user logged outStan Hu2015-06-232-3/+7
* | Merge branch 'admin-edit-identities' into 'master'Dmitriy Zaporozhets2015-06-231-0/+19
|\ \
| * \ Merge branch 'master' into admin-edit-identitiesDmitriy Zaporozhets2015-06-223-1/+9
| |\ \ | | |/
| * | Make provider a select for identities form in admin areaDmitriy Zaporozhets2015-06-221-0/+19
* | | Fix error when deleting a user who has projectsStan Hu2015-06-231-1/+1
| |/ |/|
* | Merge branch 'nginx_defaulthost_documentation' into 'master'Dmitriy Zaporozhets2015-06-222-0/+8
|\ \
| * | fixed typoLuke Ashe-Browne2014-12-031-2/+2
| * | adding notes to gitlab nginx confLuke Ashe-Browne2014-12-032-1/+9
* | | Merge branch 'restore_uploads_fix' into 'master'Dmitriy Zaporozhets2015-06-221-1/+1
|\ \ \ | |_|/ |/| |
| * | Avoid "cannot copy directory to itself" restore errorBryan Stearns2014-08-031-1/+1
* | | Fix behavior of ldap_person method in Gitlab::OAuth::UserAlex Lossent2015-06-171-4/+5
* | | Dont set checkout sha for removed branch/tagDmitriy Zaporozhets2015-06-151-2/+5
* | | Merge branch 'update_ssl_ciphers' into 'master'Dmitriy Zaporozhets2015-06-151-1/+1
|\ \ \
| * | | Update SSL ciphers per logjam vulnerability recommendations.update_ssl_ciphersMarin Jankovski2015-06-151-1/+1
* | | | Add Gitlab::Themes module; remove Gitlab::ThemeRobert Speicher2015-06-132-50/+67
|/ / /
* | | Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-121-1/+2
|\ \ \
| * | | session_expire_seconds => session_expire_delaythemaze752015-06-101-1/+1
| * | | Add session expiration delay configuration through UI applicationEric Maziade2015-06-051-1/+2
* | | | Merge branch 'note_about_omnibus_changes' into 'master'Dmitriy Zaporozhets2015-06-122-2/+14
|\ \ \ \
| * | | | Add a note that changing example configuration files requires changing omnibu...note_about_omnibus_changesMarin Jankovski2015-06-112-2/+14
* | | | | Merge pull request #9371 from zenati/patch-2Dmitriy Zaporozhets2015-06-112-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | An `in_namespace` scope is already presentzenati2015-06-092-3/+3
* | | | | Merge branch 'rs-pre-rspec-3' into 'master'Dmitriy Zaporozhets2015-06-103-4/+5
|\ \ \ \ \
| * | | | | Define GITORIOUS_HOST only onceRobert Speicher2015-06-103-4/+5
* | | | | | Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-06-101-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | use gitlab not gitlabciJeroen Nijhof2015-06-091-1/+1
| * | | | | update fog to 1.25.0 and add multipart upload supportJeroen Nijhof2015-06-091-1/+2
| |/ / / /
* | | | | Revert "No need to check if `repository_ref` is present"Jeroen van Baarsen2015-06-091-1/+5
|/ / / /
* | | | No need to check if `repository_ref` is presentzenati2015-06-081-5/+1
* | | | Merge branch 'refactor-web-editor' into 'master'Dmitriy Zaporozhets2015-06-051-24/+26
|\ \ \ \
| * | | | Fix editing files via APIDmitriy Zaporozhets2015-06-051-24/+26
* | | | | Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth'Douwe Maan2015-06-051-3/+60
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Tweak code.cernvcs/gitlab-ce-feature/auto_link_ldap_omniauthDouwe Maan2015-06-051-21/+24
| * | | | Add option to automatically link omniauth and LDAP identitiesAlex Lossent2015-06-031-4/+58
* | | | | Merge branch 'maser/gitlab-ce-order-commit-comments-in-api' into 'master'Dmitriy Zaporozhets2015-06-051-1/+1
|\ \ \ \ \
| * | | | | Order commit comments in API chronologicallyMartin Luder2015-05-081-1/+1
* | | | | | Merge branch 'fix-upgrader-script' into 'master'Dmitriy Zaporozhets2015-06-041-3/+8
|\ \ \ \ \ \
| * | | | | | Fix upgrader scriptMartins Polakovs2015-05-231-3/+8
* | | | | | | Merge branch 'make-namespaces-api-available-to-all-users' into 'master'Dmitriy Zaporozhets2015-06-041-5/+6
|\ \ \ \ \ \ \
View Lorry Controller Status