summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Also ldap_group_links where provider='ldap'Jacob Vosmaer2015-04-131-1/+1
* Merge branch 'ldap_migration' of dev.gitlab.org:gitlab/gitlabhq into ldap_mig...Jacob Vosmaer2015-04-131-1/+1
|\
| * Check for table instead of classDmitriy Zaporozhets2015-04-131-2/+2
* | Simplify legacy LDAP config interpretationJacob Vosmaer2015-04-131-2/+3
* | Make migration work if LDAP is disabledJacob Vosmaer2015-04-131-2/+7
|/
* Try to explain what we are doingJacob Vosmaer2015-04-131-0/+9
* Remove special cases for the 'ldap' providerJacob Vosmaer2015-04-132-3/+1
* Change migration to SQLDmitriy Zaporozhets2015-04-131-4/+6
* fix ldap identitiesValery Sizov2015-04-114-4/+26
* Merge branch 'rs-revert-preload-lib' into 'master'Dmitriy Zaporozhets2015-04-1010-6/+13
|\
| * Move lib/gitlab/contributors to its correct pathRobert Speicher2015-04-091-0/+0
| * Add autoloads for lib/gitlab/satellite/files/*Robert Speicher2015-04-091-0/+5
| * Add lib/gitlab.rb to autoload non-conventional pathsRobert Speicher2015-04-092-0/+7
| * Move lib/gitlab/oauth to lib/gitlab/o_authRobert Speicher2015-04-095-1/+1
| * Revert "Preload lib/"Robert Speicher2015-04-091-5/+0
* | Merge branch 'rs-issue-2211' into 'master'Dmitriy Zaporozhets2015-04-104-21/+25
|\ \ | |/ |/|
| * Be more explicit about which "Markdown" ReferenceExtractor includesRobert Speicher2015-04-091-1/+1
| * Disable RedCarpet's `escape_html` optionRobert Speicher2015-04-091-17/+21
| * Update redcarpet to 3.2.3Robert Speicher2015-04-092-3/+3
|/
* Corrected title of forking workflow on the README link.Patricio Cano2015-04-081-1/+1
* Merge branch 'fix-slashes-in-wiki-urls' into 'master'Douwe Maan2015-04-085-1/+88
|\
| * Fix bug where Wiki pages that include a '/' were no longer accessibleStan Hu2015-04-075-1/+88
* | Merge branch 'project-file-tabs' into 'master'Dmitriy Zaporozhets2015-04-082-15/+16
|\ \
| * | Move project file links to tab bar.project-file-tabsDouwe Maan2015-04-062-15/+16
* | | Merge branch 'bump_all_versions' into 'master'Dmitriy Zaporozhets2015-04-081-7/+4
|\ \ \
| * | | Added step to bump all versions (CE, EE, CI) every time there is a patch rele...Patricio Cano2015-04-071-7/+4
* | | | Merge branch 'rs-application-form-messages' into 'master'Dmitriy Zaporozhets2015-04-081-4/+6
|\ \ \ \
| * | | | Make the New Application form's error messages visibleRobert Speicher2015-04-071-4/+6
* | | | | Merge branch 'rs-issue-2152' into 'master'Dmitriy Zaporozhets2015-04-082-0/+46
|\ \ \ \ \
| * | | | | Render a 404 when RefsController#logs_tree gets an HTML requestRobert Speicher2015-04-062-0/+46
* | | | | | Merge branch 'rs-signup-box-text' into 'master'Dmitriy Zaporozhets2015-04-081-2/+3
|\ \ \ \ \ \
| * | | | | | Improve wording below signup boxRobert Speicher2015-04-071-2/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-0814-84/+36
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'add-menu-icons' into 'master'Dmitriy Zaporozhets2015-04-072-4/+9
| |\ \ \ \ \
| | * | | | | Add icons to Add dropdown items.add-menu-iconsDouwe Maan2015-04-062-5/+9
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'emailsonpush-last-line' into 'master'Dmitriy Zaporozhets2015-04-076-12/+7
| |\ \ \ \ \
| | * | | | | Update gitlab_git to 7.1.6 because 7.1.5 had broken language detection.emailsonpush-last-lineDouwe Maan2015-03-312-3/+3
| | * | | | | Update gitlab_git to 7.1.5, to fix final line in EmailsOnPush email diff bein...Douwe Maan2015-03-313-3/+4
| | * | | | | Move EmailsOnPush highlight CSS inline instead of being in every notification...Douwe Maan2015-03-313-9/+3
| * | | | | | Merge branch 'import-event' into 'master'Dmitriy Zaporozhets2015-04-077-68/+20
| |\ \ \ \ \ \
| | * | | | | | Change text of project creation event for imports.import-eventDouwe Maan2015-04-062-3/+7
| | * | | | | | Use Projects::CreateService to create imported projects so hooks are executed.Douwe Maan2015-04-064-64/+12
| | * | | | | | Allow projects to be imported into namespaces user is master of.Douwe Maan2015-04-061-1/+1
| | | |/ / / / | | |/| | | |
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-081-0/+3
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #8546 from h0ru5/patch-1Jeroen van Baarsen2015-04-081-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | add necessary dir for uploads in update to 6.7 Johannes Hund2015-01-071-0/+3
* | | | | | | | Merge branch 'rs-shortcuts-typo' into 'master'Dmitriy Zaporozhets2015-04-082-16/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Typo -- findAndollowLink -> findAndFollowLinkRobert Speicher2015-04-072-16/+16
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Corrected title of forking workflowPatricio Cano2015-04-071-1/+1
* | | | | | | | Merge branch 'forking-doc' into 'master'Sytse Sijbrandij2015-04-086-0/+37
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
View Lorry Controller Status