summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix hooks for web based events with external issue referencesext-issue-7-12Daniel Gerhardt2015-06-163-1/+13
* Version 7.12.0.rc1v7.12.0.rc1Jacob Vosmaer2015-06-121-1/+1
* Merge branch 'update-install-docs' into 'master'Marin Jankovski2015-06-121-4/+4
|\
| * New source installs should use 7-12-stableJacob Vosmaer2015-06-121-2/+2
| * Install git 2.4.3Jacob Vosmaer2015-06-121-2/+2
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-1270-831/+831
|\
| * Merge branch 'rs-expect-syntax-features' into 'master'Dmitriy Zaporozhets2015-06-1270-831/+831
| |\
| | * Call `page.all` instead of `all` in feature stepsRobert Speicher2015-06-1210-12/+12
| | * Change `within` to `page.within` in feature stepsRobert Speicher2015-06-1234-159/+159
| | * Update all `should`-style syntax to `expect` in featuresRobert Speicher2015-06-1269-662/+662
| |/
* | Merge branch 'remove-activity-feed-text' into 'master'Dmitriy Zaporozhets2015-06-123-3/+0
|\ \
| * | Remove text since rss is now to prominent.Sytse Sijbrandij2015-06-123-3/+0
* | | Merge branch 'rc1-release-doc-link' into 'master'Job van der Voort2015-06-121-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix link to howto_rc1.mdJacob Vosmaer2015-06-121-1/+1
|/ /
* | Merge branch 'note_about_omnibus_changes' into 'master'Dmitriy Zaporozhets2015-06-128-4/+31
|\ \
| * | Add a note that changing example configuration files requires changing omnibu...note_about_omnibus_changesMarin Jankovski2015-06-118-4/+31
* | | Merge branch 'refactor-mr-widget' into 'master'Dmitriy Zaporozhets2015-06-1228-299/+306
|\ \ \
| * | | Fix test for accept merge requestDmitriy Zaporozhets2015-06-121-0/+1
| * | | Fix merge request testrefactor-mr-widgetDmitriy Zaporozhets2015-06-111-1/+1
| * | | Fix automergeDmitriy Zaporozhets2015-06-112-5/+4
| * | | Improve variables in mr widgetDmitriy Zaporozhets2015-06-115-15/+8
| * | | Fix rubocopDmitriy Zaporozhets2015-06-111-2/+1
| * | | Extract merge request widget JS to separate classDmitriy Zaporozhets2015-06-1111-87/+96
| * | | Refactor merge request widget step 2Dmitriy Zaporozhets2015-06-1117-75/+60
| * | | Refactor accept merge request widgetDmitriy Zaporozhets2015-06-1123-191/+212
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-124-5/+11
|\ \ \ \
| * \ \ \ Merge branch 'fix-graph-width' into 'master'Dmitriy Zaporozhets2015-06-121-2/+2
| |\ \ \ \
| | * | | | Fix graph width on different screen sizesfix-graph-widthDmitriy Zaporozhets2015-06-111-2/+2
| | |/ / /
| * | | | Merge branch 'fluid-commit-calendar' into 'master'Dmitriy Zaporozhets2015-06-121-0/+1
| |\ \ \ \
| | * | | | Make commit calendar size depend on window sizefluid-commit-calendarDmitriy Zaporozhets2015-06-111-0/+1
| | |/ / /
| * | | | Merge branch 'rs-issue-1757' into 'master'Dmitriy Zaporozhets2015-06-111-2/+2
| |\ \ \ \
| | * | | | Add negative tabindex to Markdown Write and Preview tabsrs-issue-1757Robert Speicher2015-06-101-2/+2
| | |/ / /
| * | | | Self build images require different build commands.Sytse Sijbrandij2015-06-111-1/+6
| | |_|/ | |/| |
* | | | Merge pull request #9371 from zenati/patch-2Dmitriy Zaporozhets2015-06-116-9/+11
|\ \ \ \ | |/ / / |/| | |
| * | | An `in_namespace` scope is already presentzenati2015-06-096-9/+11
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2015-06-112-9/+10
|\ \ \ \
| * \ \ \ Merge branch 'rs-issue-1758' into 'master'Dmitriy Zaporozhets2015-06-112-9/+10
| |\ \ \ \
| | * | | | Fix "Acount" typo in 2FA docsrs-issue-1758Robert Speicher2015-06-101-3/+3
| | * | | | Update grids for 2FA detailsRobert Speicher2015-06-101-6/+7
| | | |/ / | | |/| |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqSytse Sijbrandij2015-06-111-5/+5
|\ \ \ \ \
| * \ \ \ \ Merge pull request #9382 from stefan-it/stefan/docker-documentation-fxSytse Sijbrandij2015-06-111-5/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [Docker][Documentation] Uses new docker data image from Docker Hub (*sytse/gi...Stefan Schweter2015-06-111-5/+5
| |/ / / /
* | | | | Merge branch 'info_about_namespaces' into 'master'Job van der Voort2015-06-111-178/+192
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | added links to API callsKaren Carias2015-06-101-191/+191
| * | | | fixed namespaces infoKaren Carias2015-05-281-3/+3
| * | | | added info about namespacesKaren Carias2015-05-281-0/+14
* | | | | Merge branch 'fix-importing-docs' into 'master'Job van der Voort2015-06-118-4/+4
|\ \ \ \ \
| * | | | | fix and minify imagesJob van der Voort2015-06-118-4/+4
|/ / / / /
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJob van der Voort2015-06-113-0/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'update-oauth-button-logos' into 'master'Sytse Sijbrandij2015-06-113-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |