summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \
| * | | | | Make namespace API available to all usersStan Hu2015-05-281-5/+6
* | | | | | Merge branch 'trigger_hooks_create_on_backup_restore' into 'master'Dmitriy Zaporozhets2015-06-041-0/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Trigger hooks-create on gitlab backup restore.Marin Jankovski2015-06-031-0/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-group-remove' into 'master'Dmitriy Zaporozhets2015-06-031-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'repo-remove' into fix-group-removeDmitriy Zaporozhets2015-06-031-4/+10
| |\ \ \ \ \
| * | | | | | Wrap group removal into serviceDmitriy Zaporozhets2015-06-031-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'remove_unecessary_rake_task' into 'master'Dmitriy Zaporozhets2015-06-032-56/+34
|\ \ \ \ \ \
| * | | | | | Add autocrlf back to installation docs, add a check for it.Marin Jankovski2015-06-032-2/+33
| * | | | | | Remove gitlab:env:check task.remove_unecessary_rake_taskMarin Jankovski2015-06-031-54/+1
| |/ / / / /
* | | | | | Merge branch 'repo-remove'Dmitriy Zaporozhets2015-06-031-4/+10
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Move repository when project is removedDmitriy Zaporozhets2015-06-031-4/+10
* | | | | Merge branch 'ignore-references' into 'master'Dmitriy Zaporozhets2015-06-023-39/+31
|\ \ \ \ \
| * | | | | Fix typo.Douwe Maan2015-06-021-1/+1
| * | | | | Ignore references in blockquotes.Douwe Maan2015-06-022-5/+12
| * | | | | Actually ignore references in code blocks etc.Douwe Maan2015-06-022-34/+19
* | | | | | Further limit the limited whitelist for project/group descriptionsrs-more-nofollowRobert Speicher2015-06-021-0/+1
* | | | | | Add a `pipeline` context option for SanitizationFilterRobert Speicher2015-06-022-21/+40
| |/ / / / |/| | | |
* | | | | Merge pull request #8730 from drunkard/masterMarin Jankovski2015-06-022-1/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Improve comments for shell_pathDrunkard Zhang2015-05-041-3/+2
| * | | | Specify shell while run me as git userDrunkard Zhang2015-02-042-1/+8
* | | | | Remove unnecessary satellite files and add CHANGELOG itemDmitriy Zaporozhets2015-06-022-67/+0
* | | | | Remove now unnecessary satelittes logic for creating and editing file with we...web-editor-ruggedDmitriy Zaporozhets2015-06-023-143/+0
* | | | | Disable changing of the source branch in merge request update APIStan Hu2015-05-291-2/+6
* | | | | Update jasmine:ci task to use teaspoonRobert Speicher2015-05-281-1/+1
* | | | | Merge branch 'user-destroy-wo-groups' into 'master'Dmitriy Zaporozhets2015-05-281-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | You can not remove user if he/she is an only owner of groupDmitriy Zaporozhets2015-05-281-1/+1