summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 7.5.0 startedDmitriy Zaporozhets2014-10-201-1/+1
* Merge branch 'security-api-internal-publicity' into 'master'Dmitriy Zaporozhets2014-10-206-6/+42
|\
| * bump gitlab-shelleValery Sizov2014-10-161-1/+1
| * add gitlab-shell identificationValery Sizov2014-10-156-6/+42
* | Merge pull request #7856 from cirosantilli/error-to-msgDmitriy Zaporozhets2014-10-207-11/+42
|\ \
| * | Use :message key, not :error for File::Service.Ciro Santilli2014-10-137-11/+42
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-202-2/+5
|\ \ \
| * \ \ Merge pull request #8017 from mr-vinn/md-table-docRobert Schilling2014-10-201-0/+4
| |\ \ \
| | * | | Document Markdown table formatting issueVinnie Okada2014-10-111-0/+4
| | | |/ | | |/|
| * | | Merge pull request #8058 from bbodenmiller/patch-14Robert Schilling2014-10-181-2/+1
| |\ \ \
| | * | | simplify DHE parameter generationBen Bodenmiller2014-10-161-2/+1
* | | | | Merge branch 'ldap-fixes' into 'master'Dmitriy Zaporozhets2014-10-202-2/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Default the LDAP server label to LDAPJan-Willem van der Meer2014-10-171-1/+1
| * | | | Prevent redeclaration of LDAP strategyJan-Willem van der Meer2014-10-171-1/+2
* | | | | Merge branch 'link-to-trending-projects-instead-of-all' into 'master'Dmitriy Zaporozhets2014-10-171-1/+1
|\ \ \ \ \
| * | | | | Link to trending public projects so more relevant projects are shown to new u...Sytse Sijbrandij2014-10-171-1/+1
* | | | | | Merge branch 'improve-ci-widgets' into 'master'Dmitriy Zaporozhets2014-10-171-0/+6
|\ \ \ \ \ \
| * | | | | | Improve visual detection of CI statusDmitriy Zaporozhets2014-10-171-0/+6
| |/ / / / /
* | | | | | Increase participants block marginDmitriy Zaporozhets2014-10-171-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch '7-4-stable' into 'master'Dmitriy Zaporozhets2014-10-174-19/+159
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' into '7-4-stable'Dmitriy Zaporozhets2014-10-173-34/+117
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'fix-oauth-block' into 'master'Dmitriy Zaporozhets2014-10-172-19/+89
|\ \ \ \ \
| * | | | | Fix account existing blockingDmitriy Zaporozhets2014-10-172-19/+89
|/ / / / /
* | | | | Refactor error message a bitDmitriy Zaporozhets2014-10-171-2/+10
* | | | | Merge branch 'issue-respect-single-sign-on' into 'master'Dmitriy Zaporozhets2014-10-173-23/+28
|\ \ \ \ \
| * | | | | Add regressiontest to verify allow_single_sign_on settingJan-Willem van der Meer2014-10-163-22/+27
| * | | | | Remove LDAP save testJan-Willem van der Meer2014-10-161-8/+8
| | * | | | documents updatedValery Sizov2014-10-174-19/+159
| |/ / / / |/| | | |
* | | | | Fix snippets seedsDmitriy Zaporozhets2014-10-161-8/+26
* | | | | Merge branch 'add_some_stuff_to_changelog' into 'master'Dmitriy Zaporozhets2014-10-161-0/+7
|\ \ \ \ \
| * | | | | Add items to changelogValery Sizov2014-10-161-0/+7
| | |/ / / | |/| | |
* | | | | Merge branch 'issue-respect-single-sign-on' into 'master'Dmitriy Zaporozhets2014-10-161-2/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Disallow new users from Oauth signup if `allow_single_sign_on` is disabledJan-Willem van der Meer2014-10-161-2/+6
|/ / /
* | | Merge branch 'fix_project_number_ci' into 'master'Dmitriy Zaporozhets2014-10-161-4/+4
|\ \ \
| * | | Make semaphore configuration an ordered list.Achilleas Pipinellis2014-10-151-3/+3
| * | | Point to correct project on githost.io.Achilleas Pipinellis2014-10-151-1/+1
|/ / /
* | | Merge branch 'note-omnibus-in-installation' into 'master'Dmitriy Zaporozhets2014-10-152-1/+5
|\ \ \
| * | | Refer to the Omnibus installation from eveerywhere since people link to insta...Sytse Sijbrandij2014-10-152-1/+5
* | | | Merge branch 'improve-lock-mr-ui' into 'master'Dmitriy Zaporozhets2014-10-152-1/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Show merge in progress message if MR is lockedDmitriy Zaporozhets2014-10-152-1/+7
* | | | Merge branch 'no_red_builds_policy' into 'master'Dmitriy Zaporozhets2014-10-152-9/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Use clearer description.Marin Jankovski2014-10-151-1/+1
| * | | Describe who can trigger builds and where, add no red tests policy to contrib...Marin Jankovski2014-10-152-9/+12
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-151-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #8048 from skv-headless/masterDmitriy Zaporozhets2014-10-151-1/+1
| |\ \ \ \
| | * | | | same rendering for note diff as for usual diffEvgeniy Sokovikov2014-10-151-1/+1
* | | | | | Merge branch 'migrating_from_svn_doc'Dmitriy Zaporozhets2014-10-154-2/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add links to the migration doc, make it clear import is only for git repos.Marin Jankovski2014-10-153-2/+5
| * | | | | Git is a distributed vcs.Marin Jankovski2014-10-151-1/+1
| * | | | | Clearer what to contribute.Marin Jankovski2014-10-151-1/+1