Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add screenshots to gitlab-flow article | Job van der Voort | 2014-09-28 | 11 | -10/+10 |
| | |||||
* | add graphs to git-flow article | Job van der Voort | 2014-09-28 | 5 | -5/+5 |
| | |||||
* | Add wisdom about reverting a revert merge. | Sytse Sijbrandij | 2014-09-22 | 1 | -1/+3 |
| | |||||
* | Add sentence about tools not being able to compensate for changing commit id's. | Sytse Sijbrandij | 2014-09-17 | 1 | -0/+1 |
| | |||||
* | Improve the rebase reasoning. | Sytse Sijbrandij | 2014-09-17 | 1 | -4/+7 |
| | |||||
* | Insert at a random point in the changelog to prevent conflicts. | Sytse Sijbrandij | 2014-09-08 | 2 | -2/+6 |
| | |||||
* | Fix problems identified by Achilleas Pipinellis, thanks Achilleas. | Sytse Sijbrandij | 2014-09-08 | 1 | -35/+38 |
| | |||||
* | It's the shell. | Sytse Sijbrandij | 2014-09-02 | 1 | -1/+1 |
| | |||||
* | Four stages. | Sytse Sijbrandij | 2014-09-02 | 1 | -1/+1 |
| | |||||
* | Adding image descriptions and links as well as consolidating the link and ↵ | Sytse Sijbrandij | 2014-09-02 | 1 | -28/+24 |
| | | | | close issues text. | ||||
* | Rewrite this section after suggestion from Achilleas. | Sytse Sijbrandij | 2014-09-01 | 1 | -2/+2 |
| | |||||
* | Fixed items mentioned by Achilleas Pipinellis, thanks. | Sytse Sijbrandij | 2014-09-01 | 1 | -6/+7 |
| | |||||
* | Fix spelling mistakes, thanks Achilleas Pipinellis and Stephan van Leeuwen. | Sytse Sijbrandij | 2014-08-31 | 1 | -7/+7 |
| | |||||
* | Fix spelling mistakes, thanks Nico Hamm. | Sytse Sijbrandij | 2014-08-30 | 1 | -2/+2 |
| | |||||
* | Fix grammar mistakes, thanks Angus | Sytse Sijbrandij | 2014-08-25 | 1 | -3/+3 |
| | |||||
* | Add GitLab Flow to the index. | Sytse Sijbrandij | 2014-08-25 | 1 | -0/+1 |
| | |||||
* | Add article about GitLab flow. | Sytse Sijbrandij | 2014-08-25 | 1 | -0/+265 |
| | |||||
* | Merge branch 'annotate' into 'master' | Dmitriy Zaporozhets | 2014-08-25 | 17 | -8/+172 |
|\ | | | | | | | | | | | Annotate See merge request !1040 | ||||
| * | Annotate models | Dmitriy Zaporozhets | 2014-08-25 | 17 | -8/+172 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Merge branch 'fork-star-bug' into 'master' | Dmitriy Zaporozhets | 2014-08-25 | 2 | -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 project | Dmitriy Zaporozhets | 2014-08-25 | 2 | -15/+15 |
|/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge pull request #7594 from bbodenmiller/patch-3 | Sytse Sijbrandij | 2014-08-25 | 1 | -1/+1 |
|\ | | | | | Monthly active users -> Active users last 30 days | ||||
| * | Monthly active users -> Active users last 30 days | Ben Bodenmiller | 2014-08-24 | 1 | -1/+1 |
|/ | | | Clarify what `Monthly active users` means by changing to `Active users last 30 days`. | ||||
* | Merge pull request #7593 from bbodenmiller/patch-3 | Robert Schilling | 2014-08-24 | 1 | -8/+1 |
|\ | | | | | remove extra cd's to GitLab installation folder | ||||
| * | remove extra cd's to GitLab installation folder | Ben Bodenmiller | 2014-08-24 | 1 | -8/+1 |
|/ | |||||
* | Merge pull request #7569 from offlinehoster/patch-2 | Sytse Sijbrandij | 2014-08-24 | 1 | -2/+3 |
|\ | | | | | Added AsciiDoc support and changed to singlequotes | ||||
| * | Added AsciiDoc support and changed to singlequotes | Christian Sarazin | 2014-08-22 | 1 | -2/+3 |
| | | | | | | extension to https://github.com/gitlabhq/gitlabhq/pull/7568 | ||||
* | | Merge pull request #7582 from bbodenmiller/patch-5 | Robert Schilling | 2014-08-24 | 1 | -5/+5 |
|\ \ | | | | | | | [Documentation] more cleanup installation guide formatting | ||||
| * | | improve formatting | Ben Bodenmiller | 2014-08-23 | 1 | -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-3 | Robert Schilling | 2014-08-24 | 1 | -1/+9 |
|\ \ \ | |/ / |/| | | [Documentation] add nginx test | ||||
| * | | add Nginx test | Ben Bodenmiller | 2014-08-23 | 1 | -1/+9 |
|/ / | |||||
* | | Merge pull request #7518 from jvanbaarsen/snippet-charset-fix | Dmitriy Zaporozhets | 2014-08-23 | 2 | -2/+2 |
|\ \ | | | | | | | Set charset encoding to UTF-8 for snippets | ||||
| * | | Set charset encoding to UTF-8 for snippets | Jeroen van Baarsen | 2014-08-16 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | Fixes #2678 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | ||||
* | | | Merge pull request #7558 from bbodenmiller/patch-4 | Dmitriy Zaporozhets | 2014-08-23 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | change X-Frame-Options to SAMEORIGIN for nginx SSL config | ||||
| * | | | change X-Frame-Options to SAMEORIGIN | Ben Bodenmiller | 2014-08-23 | 1 | -1/+1 |
| | | | | | | | | | | | | needed to allow sidekiq to load on background jobs tab | ||||
* | | | | Merge branch 'blacklist/unsubscribes' into 'master' | Dmitriy Zaporozhets | 2014-08-23 | 1 | -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 blacklist | Jacob Vosmaer | 2014-08-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | GitLab EE has a /unsubscribes/ route. | ||||
| * | | | | Use one word per line in Gitlab::Blacklist | Jacob Vosmaer | 2014-08-22 | 1 | -1/+23 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'always_set_satellite_origin' into 'master' | Dmitriy Zaporozhets | 2014-08-23 | 2 | -0/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Always set satellite origin See merge request !1036 | ||||
| * | | | | Always set the origin remote in satellite actions | Jacob Vosmaer | 2014-08-22 | 2 | -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 Zaporozhets | 2014-08-23 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Import the database as the `git` user See merge request !762 | ||||
| * | | | | Import the database as the `git` user | Jacob Vosmaer | 2014-05-19 | 1 | -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 Zaporozhets | 2014-08-23 | 9 | -32/+50 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaner UI for login and signup pages    See merge request !1022 | ||||
| * | | | | | Cleaner UI for login/signup pages | Dmitriy Zaporozhets | 2014-08-15 | 9 | -32/+50 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | Merge pull request #7578 from bbodenmiller/patch-8 | Sytse Sijbrandij | 2014-08-23 | 2 | -46/+64 |
|\ \ \ \ \ | | | | | | | | | | | | | Unify Nginx files to match as closely as possible | ||||
| * | | | | | unify nginx config files | Ben Bodenmiller | 2014-08-23 | 2 | -46/+64 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Remove outdated 6.0 to 7.1 update guide | Robert Schilling | 2014-08-23 | 1 | -182/+0 |
| | | | | | |||||
* | | | | | 7.3 started | Robert Schilling | 2014-08-23 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #7585 from bbodenmiller/patch-11 | Robert Schilling | 2014-08-23 | 1 | -2/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | clarify which configs should be updated | ||||
| * | | | | | clarify which configs should be updated | Ben Bodenmiller | 2014-08-23 | 1 | -2/+8 |
| |/ / / / |