summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* add screenshots to gitlab-flow articleJob van der Voort2014-09-2811-10/+10
|
* add graphs to git-flow articleJob van der Voort2014-09-285-5/+5
|
* Add wisdom about reverting a revert merge.Sytse Sijbrandij2014-09-221-1/+3
|
* Add sentence about tools not being able to compensate for changing commit id's.Sytse Sijbrandij2014-09-171-0/+1
|
* Improve the rebase reasoning.Sytse Sijbrandij2014-09-171-4/+7
|
* Insert at a random point in the changelog to prevent conflicts.Sytse Sijbrandij2014-09-082-2/+6
|
* Fix problems identified by Achilleas Pipinellis, thanks Achilleas.Sytse Sijbrandij2014-09-081-35/+38
|
* It's the shell.Sytse Sijbrandij2014-09-021-1/+1
|
* Four stages.Sytse Sijbrandij2014-09-021-1/+1
|
* Adding image descriptions and links as well as consolidating the link and ↵Sytse Sijbrandij2014-09-021-28/+24
| | | | close issues text.
* Rewrite this section after suggestion from Achilleas.Sytse Sijbrandij2014-09-011-2/+2
|
* Fixed items mentioned by Achilleas Pipinellis, thanks.Sytse Sijbrandij2014-09-011-6/+7
|
* Fix spelling mistakes, thanks Achilleas Pipinellis and Stephan van Leeuwen.Sytse Sijbrandij2014-08-311-7/+7
|
* Fix spelling mistakes, thanks Nico Hamm.Sytse Sijbrandij2014-08-301-2/+2
|
* Fix grammar mistakes, thanks AngusSytse Sijbrandij2014-08-251-3/+3
|
* Add GitLab Flow to the index.Sytse Sijbrandij2014-08-251-0/+1
|
* Add article about GitLab flow.Sytse Sijbrandij2014-08-251-0/+265
|
* Merge branch 'annotate' into 'master'Dmitriy Zaporozhets2014-08-2517-8/+172
|\ | | | | | | | | | | Annotate See merge request !1040
| * Annotate modelsDmitriy Zaporozhets2014-08-2517-8/+172
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fork-star-bug' into 'master'Dmitriy Zaporozhets2014-08-252-15/+15
|\ \ | |/ |/| | | | | | | | | | | Fork star bug Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/523 See merge request !1039
| * Prevent project stars duplication when fork projectDmitriy Zaporozhets2014-08-252-15/+15
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #7594 from bbodenmiller/patch-3Sytse Sijbrandij2014-08-251-1/+1
|\ | | | | Monthly active users -> Active users last 30 days
| * Monthly active users -> Active users last 30 daysBen Bodenmiller2014-08-241-1/+1
|/ | | Clarify what `Monthly active users` means by changing to `Active users last 30 days`.
* Merge pull request #7593 from bbodenmiller/patch-3Robert Schilling2014-08-241-8/+1
|\ | | | | remove extra cd's to GitLab installation folder
| * remove extra cd's to GitLab installation folderBen Bodenmiller2014-08-241-8/+1
|/
* Merge pull request #7569 from offlinehoster/patch-2Sytse Sijbrandij2014-08-241-2/+3
|\ | | | | Added AsciiDoc support and changed to singlequotes
| * Added AsciiDoc support and changed to singlequotesChristian Sarazin2014-08-221-2/+3
| | | | | | extension to https://github.com/gitlabhq/gitlabhq/pull/7568
* | Merge pull request #7582 from bbodenmiller/patch-5Robert Schilling2014-08-241-5/+5
|\ \ | | | | | | [Documentation] more cleanup installation guide formatting
| * | improve formattingBen Bodenmiller2014-08-231-5/+5
| | | | | | | | | | | | | | | | | | * fix code blocks * Make capitalization of titles consistent - missed some in https://github.com/gitlabhq/gitlabhq/pull/7576
* | | Merge pull request #7575 from bbodenmiller/patch-3Robert Schilling2014-08-241-1/+9
|\ \ \ | |/ / |/| | [Documentation] add nginx test
| * | add Nginx testBen Bodenmiller2014-08-231-1/+9
|/ /
* | Merge pull request #7518 from jvanbaarsen/snippet-charset-fixDmitriy Zaporozhets2014-08-232-2/+2
|\ \ | | | | | | Set charset encoding to UTF-8 for snippets
| * | Set charset encoding to UTF-8 for snippetsJeroen van Baarsen2014-08-162-2/+2
| | | | | | | | | | | | | | | | | | Fixes #2678 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Merge pull request #7558 from bbodenmiller/patch-4Dmitriy Zaporozhets2014-08-231-1/+1
|\ \ \ | | | | | | | | change X-Frame-Options to SAMEORIGIN for nginx SSL config
| * | | change X-Frame-Options to SAMEORIGINBen Bodenmiller2014-08-231-1/+1
| | | | | | | | | | | | needed to allow sidekiq to load on background jobs tab
* | | | Merge branch 'blacklist/unsubscribes' into 'master'Dmitriy Zaporozhets2014-08-231-1/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'unsubscribes' to the paths blacklist This is to prevent issues with the admin email feature in GitLab EE. See merge request !1034
| * | | | Add 'unsubscribes' to the paths blacklistJacob Vosmaer2014-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | GitLab EE has a /unsubscribes/ route.
| * | | | Use one word per line in Gitlab::BlacklistJacob Vosmaer2014-08-221-1/+23
| | |_|/ | |/| |
* | | | Merge branch 'always_set_satellite_origin' into 'master'Dmitriy Zaporozhets2014-08-232-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Always set satellite origin See merge request !1036
| * | | | Always set the origin remote in satellite actionsJacob Vosmaer2014-08-222-0/+4
| |/ / / | | | | | | | | | | | | | | | | This prevents issues with satellites containing outdated origin remotes after administrators move the git repositories directory.
* | | | Merge branch 'import_postgres_user' into 'master'Dmitriy Zaporozhets2014-08-231-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Import the database as the `git` user See merge request !762
| * | | | Import the database as the `git` userJacob Vosmaer2014-05-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that all tables created during the import belong to `git`. If you import as a different user, such as the `postgres` superuser, you may encounter issues where the GitLab database user cannot access tables in gitlabhq_production, _even if_ `git` is the owner of gitlabhq_production at the time of import.
* | | | | Merge branch 'cleaner-login' into 'master'Dmitriy Zaporozhets2014-08-239-32/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaner UI for login and signup pages ![Screenshot 2014-08-15 17.51.52](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/fc8bf3c4a4/Screenshot_2014-08-15_17.51.52.png) ![Screenshot 2014-08-15 17.52.39](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/72706f55b0/Screenshot_2014-08-15_17.52.39.png) ![Screenshot 2014-08-15 17.51.33](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/c46f972944/Screenshot_2014-08-15_17.51.33.png) See merge request !1022
| * | | | | Cleaner UI for login/signup pagesDmitriy Zaporozhets2014-08-159-32/+50
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge pull request #7578 from bbodenmiller/patch-8Sytse Sijbrandij2014-08-232-46/+64
|\ \ \ \ \ | | | | | | | | | | | | Unify Nginx files to match as closely as possible
| * | | | | unify nginx config filesBen Bodenmiller2014-08-232-46/+64
| | |_|_|/ | |/| | |
* | | | | Remove outdated 6.0 to 7.1 update guideRobert Schilling2014-08-231-182/+0
| | | | |
* | | | | 7.3 startedRobert Schilling2014-08-231-1/+1
| | | | |
* | | | | Merge pull request #7585 from bbodenmiller/patch-11Robert Schilling2014-08-231-2/+8
|\ \ \ \ \ | | | | | | | | | | | | clarify which configs should be updated
| * | | | | clarify which configs should be updatedBen Bodenmiller2014-08-231-2/+8
| |/ / / /