summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use correct name for the script.build_scriptMarin Jankovski2015-06-181-1/+1
* Move prepare_build script to scripts dir.Marin Jankovski2015-06-182-1/+1
* Add a build preparation script, modify gitlab.ci.yml to use the script.Marin Jankovski2015-06-172-10/+28
* Merge branch 'from_own_instance' into 'master'Job van der Voort2015-06-171-0/+3
|\
| * added info about migrating to gitlab.comKaren Carias2015-06-171-0/+3
* | Merge branch 'rs-rails-update' into 'master'Dmitriy Zaporozhets2015-06-172-34/+37
|\ \
| * | Bump jquery-rails gem versionrs-rails-updateRobert Speicher2015-06-162-3/+3
| * | Bump rails to 4.1.11, and make the version requirement exactRobert Speicher2015-06-162-31/+34
|/ /
* | Merge branch 'rs-bootlint-fixes' into 'master'Robert Speicher2015-06-1620-29/+23
|\ \ | |/ |/|
| * Bootlint: Fix incorrectly nested `form-group` elementRobert Speicher2015-06-161-2/+2
| * Bootlint: Add missing `type` attribute for buttonsRobert Speicher2015-06-162-1/+3
| * Bootlint: Modals no longer need a '.hide' classRobert Speicher2015-06-168-8/+8
| * Bootlint: Use offset grid classes instead of empty divsRobert Speicher2015-06-1610-18/+10
|/
* Merge branch 'support-comment-parallel-diff' into 'master'Douwe Maan2015-06-1612-44/+139
|\
| * Support commenting on a diff in side-by-side viewStan Hu2015-06-1612-44/+139
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-161-0/+8
|\ \
| * \ Merge branch 'require_kerberos_when_enabled' into 'master'Dmitriy Zaporozhets2015-06-161-0/+8
| |\ \ | | |/ | |/|
| | * Use explicit if.Marin Jankovski2015-06-161-2/+3
| | * If kerberos is enabled require it.require_kerberos_when_enabledMarin Jankovski2015-06-151-0/+7
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-163-1/+13
|\ \ \ | |/ /
| * | Merge branch 'fix-ext-issue-webbased-hooks' into 'master'Douwe Maan2015-06-163-1/+13
| |\ \
| | * | Fix hooks for web based events with external issue referencesDaniel Gerhardt2015-06-143-1/+13
* | | | Merge branch 'header_layout_issue' into 'master'Douwe Maan2015-06-164-17/+14
|\ \ \ \
| * | | | Fix layout issue in header title truncation.Nicolas2015-06-164-17/+14
| |/ / /
* | | | Merge branch 'applications_form' into 'master'Douwe Maan2015-06-164-15/+26
|\ \ \ \
| * | | | Fix consistency issues on New Application page.Nicolas2015-06-153-4/+10
| * | | | Fix layout issue when New Application validation fails.Nicolas2015-06-151-10/+15
| * | | | Highlight Applications nav item when validation fails.Nicolas2015-06-141-1/+1
| | |/ / | |/| |
* | | | Merge branch 'update-release-doc' into 'master'Job van der Voort2015-06-161-3/+1
|\ \ \ \
| * | | | Add 'build RC1 packages' to monthly release stepsJacob Vosmaer2015-06-151-0/+1
| * | | | The changelogs are kept up to date continuouslyJacob Vosmaer2015-06-151-3/+0
* | | | | Merge branch 'db-dump-instructions' into 'master'Dmitriy Zaporozhets2015-06-161-0/+5
|\ \ \ \ \
| * | | | | Improve DB dump instructionsJacob Vosmaer2015-06-161-0/+5
| |/ / / /
* | | | | Merge branch 'new_syntax_yaml' into 'master'Valery Sizov2015-06-161-25/+37
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | new syntax of .gitlab-ci.ymlValery Sizov2015-06-151-25/+37
|/ / / /
* | | | Merge branch 'fix-gitlab-ci-yml' into 'master'Dmitriy Zaporozhets2015-06-153-12/+19
|\ \ \ \ | |_|_|/ |/| | |
| * | | Look for .gitlab-ci.yml only if checkout_sha is presentfix-gitlab-ci-ymlDmitriy Zaporozhets2015-06-152-10/+14
| * | | Dont set checkout sha for removed branch/tagDmitriy Zaporozhets2015-06-151-2/+5
|/ / /
* | | Merge branch 'blog-post-in-advance' into 'master'Job van der Voort2015-06-151-2/+4
|\ \ \
| * | | Prepare blog post in advanceSytse Sijbrandij2015-06-151-2/+4
* | | | Merge branch 'fix-ext-issue-tracker-hook' into 'master'Dmitriy Zaporozhets2015-06-152-10/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Fix external issue tracker hook/test for HTTPS URLsdgerhardt/gitlab-ce-fix-ext-issue-tracker-hookDaniel Gerhardt2015-06-052-10/+6
* | | | Fix text align in last push eventDmitriy Zaporozhets2015-06-151-1/+1
* | | | Merge branch 'update_ssl_ciphers' into 'master'Dmitriy Zaporozhets2015-06-152-1/+2
|\ \ \ \
| * | | | Update SSL ciphers per logjam vulnerability recommendations.update_ssl_ciphersMarin Jankovski2015-06-152-1/+2
* | | | | Merge branch 'rs-dev-issue-2228' into 'master'Dmitriy Zaporozhets2015-06-1561-412/+901
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move CHANGELOG item to 7.13Dmitriy Zaporozhets2015-06-151-3/+5
| * | | | Fix doc typosrs-dev-issue-2228Robert Speicher2015-06-151-7/+6
| * | | | Add `allowing_for_delay` helper method for feature specsRobert Speicher2015-06-142-6/+41
| * | | | Refactor RootControllerRobert Speicher2015-06-131-2/+12
View Lorry Controller Status