summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* satisfy rubocopcrowdValery Sizov2015-09-073-22/+26
* added spinachValery Sizov2015-09-022-0/+26
* Crowd integrationValery Sizov2015-09-0211-4/+96
* Merge branch 'drone-ci' into 'master'Douwe Maan2015-09-0215-136/+1042
|\
| * Drone CI serviceKirilll Zaitsev2015-09-0215-136/+1042
|/
* Merge branch 'use_db_for_application_settings' into 'master'Marin Jankovski2015-09-012-2/+15
|\
| * Added USE_DB env var to allow loading fake settings without db running.use_db_for_application_settingsMarin Jankovski2015-09-012-2/+15
* | Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'Douwe Maan2015-09-0133-140/+162
|\ \
| * | Remove PreferencesHelper include from GitlabMarkdownHelperrs-cleanup-redcarpet-rendererRobert Speicher2015-09-011-2/+0
| * | Require gitlab/markdown in ReferenceExtractorRobert Speicher2015-09-011-0/+2
| * | Make sure the `gfm` helper passes the required optionsRobert Speicher2015-08-312-2/+10
| * | Remove unnecessary `strip` from `reference_class` methodRobert Speicher2015-08-311-1/+1
| * | Move REDCARPET_OPTIONS to a private methodRobert Speicher2015-08-311-14/+16
| * | Remove invalid spec for GitlabMarkdownHelperRobert Speicher2015-08-311-5/+0
| * | Make `gfm` delegate to `Gitlab::Markdown.gfm` instead of `markdown`Robert Speicher2015-08-311-1/+1
| * | Fix context options in `markdown` helperRobert Speicher2015-08-311-5/+5
| * | Make sure the main Gitlab::Markdown module gets loaded before filtersRobert Speicher2015-08-2718-1/+28
| * | Add a temporary `gfm` helper that just delegates to `markdown`Robert Speicher2015-08-271-0/+6
| * | Reference filters no longer take a custom class context optionRobert Speicher2015-08-2710-43/+1
| * | Restore the forwarded HTML options in link_to_gfmRobert Speicher2015-08-272-0/+15
| * | Decouple Gitlab::Markdown from the GitlabMarkdownHelperRobert Speicher2015-08-277-100/+111
* | | Merge branch 'fix-bitbucket-import-issue-order' into 'master'Douwe Maan2015-09-017-13/+90
|\ \ \
| * | | Fix bug where only the first 15 Bitbucket issues would be imported.Stan Hu2015-09-017-13/+89
| * | | Sort issues by creation date in Bitbucket importerStan Hu2015-09-012-1/+2
* | | | Merge branch 'gitlab-git-http-server' into 'master'Dmitriy Zaporozhets2015-09-0110-95/+299
|\ \ \ \
| * | | | Be more defensive when running 'kill'gitlab-git-http-serverJacob Vosmaer2015-08-311-1/+1
| * | | | Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-serverJacob Vosmaer2015-08-3137-129/+311
| |\ \ \ \
| * | | | | Replace grack with gitlab-git-http-serverJacob Vosmaer2015-08-3110-95/+299
* | | | | | Merge branch 'profile-settings' into 'master' Dmitriy Zaporozhets2015-09-013-25/+25
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Update db schemaDmitriy Zaporozhets2015-09-011-22/+22
| * | | | | Rename profile settings navigation to "Profile Settings"Dmitriy Zaporozhets2015-09-012-3/+3
|/ / / / /
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-09-011-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'master'Valery Sizov2015-09-011-1/+1
| |\ \ \ \ \
| | * | | | | Update Racc to 1.4.12Yorick Peterse2015-08-251-1/+1
* | | | | | | Merge branch 'add-commands' into 'master' Job van der Voort2015-09-011-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | deleted additional infokaren Carias2015-08-311-3/+0
| * | | | | | added new commandskaren Carias2015-08-251-2/+0
| * | | | | | added new commandskaren Carias2015-08-252-0/+10
* | | | | | | Merge branch 'fix-branches-cache-after-merge' into 'master'Valery Sizov2015-09-013-1/+33
|\ \ \ \ \ \ \
| * | | | | | | Expire cache when merge request source branch was removedfix-branches-cache-after-mergeDmitriy Zaporozhets2015-08-283-1/+33
* | | | | | | | Merge branch 'oauth_token_with_ldap' into 'master'Dmitriy Zaporozhets2015-09-012-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | retrieving oauth token with LDAP credentialsoauth_token_with_ldapValery Sizov2015-08-312-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'fix-headers-blocking-anchors' into 'master'Dmitriy Zaporozhets2015-08-312-5/+8
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Prevent anchors from being hidden by header upon a new page load.Stan Hu2015-08-292-5/+8
* | | | | | | Ordering of GitHub issues import is now fixedAchilleas Pipinellis2015-08-311-1/+1
* | | | | | | Merge branch 'dont-notify-users-without-project-access' into 'master'Robert Speicher2015-08-303-5/+18
|\ \ \ \ \ \ \
| * | | | | | | Don't notify users without access to the project when they are (accidentally)...dont-notify-users-without-project-accessDouwe Maan2015-08-263-5/+18
* | | | | | | | Merge branch 'joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993'Douwe Maan2015-08-295-4/+46
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Move changelog itemjoelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-291-1/+1
| * | | | | | | Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-29227-915/+4962
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
View Lorry Controller Status