summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add missing proxy requests to migration docsfix-nginxKamil Trzcinski2015-09-162-0/+24
|
* Merge branch 'add-links-to-ci' into 'master'Dmitriy Zaporozhets2015-09-163-0/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | Add links from GitLab to CI * link from dashboard to CI dashboard * link from project to CI project Its a fast solution for 8.0. Might be improved in later versions Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1313
| * Add links from GitLab to CIDmitriy Zaporozhets2015-09-163-0/+10
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix-gitlab-ci-in-ce' into 'master'Dmitriy Zaporozhets2015-09-168-4/+31
|\ \ | |/ |/| | | | | | | | | | | Fix first bunch of regressions in GitLab CI /cc @vsizov @dzaporozhets See merge request !1312
| * Make rubocop happyKamil Trzcinski2015-09-161-1/+1
| |
| * Fix CI testsKamil Trzcinski2015-09-162-3/+3
| |
| * Fix ordering issueKamil Trzcinski2015-09-164-2/+26
| |
| * Fix skipped svgKamil Trzcinski2015-09-161-0/+1
| |
| * Fix update_runner_info helperKamil Trzcinski2015-09-161-0/+2
| |
| * Fix migrate tags statementKamil Trzcinski2015-09-161-1/+1
| |
| * Fix projects editKamil Trzcinski2015-09-161-1/+1
| |
* | Merge branch 'markdown_help_fix' into 'master'Robert Schilling2015-09-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix in Markdown help page: properly create the link to a wiki page. The help file on Markdown that is included with Gitlab CE (7.14.3 d321305) and also gitlab.com (see https://gitlab.com/help/markdown/markdown#links) contains a typo in the description of a link to a wiki page. See merge request !1310
| * | Fix in Markdown help page: properly create the link to a wiki page.Nicolas Bigaouette2015-09-161-1/+1
|/ / | | | | | | | | | | The help file on Markdown that is included with Gitlab CE (7.14.3 d321305) and also gitlab.com (see https://gitlab.com/help/markdown/markdown#links) contains a typo in the description of a link to a wiki page.
* | Fix gemfile.lockDmitriy Zaporozhets2015-09-161-1/+4
| |
* | Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' into 'master'Kamil Trzciński2015-09-16346-416/+16119
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge CI into CE First step of #2164. - [x] Merge latest CE master - [x] Make application start - [x] Re-use gitlab sessions (remove CI oauth part) - [x] Get rid of gitlab_ci.yml config - [x] Make tests start - [x] Make most CI features works - [x] Make tests green - [x] Write migration documentation - [x] Add CI builds to CE backup See merge request !1204
| * Merge remote-tracking branch 'origin/master' into ↵ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gKamil Trzcinski2015-09-168-48/+385
| |\ | |/ |/| | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
* | Merge branch 'fix-api-mr-sort' into 'master'Dmitriy Zaporozhets2015-09-163-13/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken sort in merge request API This MR fixes a bug in the API in querying for merge requests with a `sort_by` field would never change the ordering of the results. Closes #2266 See merge request !1305
| * | Fix broken sort in merge request APIStan Hu2015-09-153-13/+15
| | | | | | | | | | | | Closes #2266
* | | Merge branch 'reply-by-email-docs' into 'master'Douwe Maan2015-09-162-31/+364
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Expand Reply by email documentation TODO: - [x] Verify this works on dev server - [ ] Figure out SSL somehow: http://www.postfix.org/TLS_README.html (Moved to #2453) See merge request !1193
| * | Tweak textDouwe Maan2015-09-161-5/+5
| | |
| * | Fix sudo_gitlab helperreply-by-email-docsDouwe Maan2015-09-101-4/+2
| | |
| * | Move source section below omnibus section.Douwe Maan2015-09-091-31/+31
| | |
| * | Restructure omnibus instructions to match those for source installations.Douwe Maan2015-09-091-22/+26
| | |
| * | Merge branch 'master' into reply-by-email-docsDouwe Maan2015-09-09321-1717/+3987
| |\ \
| * | | Tweak check rake task.Douwe Maan2015-08-271-2/+2
| | | |
| * | | Add omnibus-gitlab configuration example.Marin Jankovski2015-08-271-8/+31
| | | |
| * | | Use sudu -u git where appropriateDouwe Maan2015-08-262-5/+7
| | | |
| * | | Simplify docDouwe Maan2015-08-261-15/+3
| | | |
| * | | No mailbox_command neededDouwe Maan2015-08-251-1/+0
| | | |
| * | | No DNS setup necessary, but firewall setup may be.Douwe Maan2015-08-251-25/+8
| | | |
| * | | Fix docsDouwe Maan2015-08-252-7/+19
| | | |
| * | | Don't overwrite /etc/default/gitlab.Douwe Maan2015-08-251-4/+6
| | | |
| * | | Expand documentationDouwe Maan2015-08-242-3/+321
| | | |
| * | | Tweak Reply by email docs.Douwe Maan2015-08-241-1/+5
| | | |
* | | | Merge pull request #9634 from allistera/users-autocomplete-sort-orderStan Hu2015-09-152-0/+2
|\ \ \ \ | | | | | | | | | | Sorted autocomplete users list by name
| * | | | Sorted autocomplete users list by nameAllister Antosik2015-09-152-0/+2
| | | | |
* | | | | Merge pull request #9633 from szechyjs/update-fogbugz-gemStan Hu2015-09-152-3/+3
|\ \ \ \ \ | | | | | | | | | | | | bump fogbugz gem
| * | | | | bump fogbugz gemJared Szechy2015-09-152-3/+3
| | | | | |
| | | | | * Fix migrate taskKamil Trzcinski2015-09-161-1/+1
| | | | | |
| | | | | * fix rubocopValery Sizov2015-09-161-0/+1
| | | | | |
| | | | | * Added info about gitlab.yml configKamil Trzcinski2015-09-161-18/+35
| | | | | |
| | | | | * Added migration docs and updated installation documentationKamil Trzcinski2015-09-165-1/+275
| | | | | |
| | | | | * Migrate CI servicesKamil Trzcinski2015-09-161-0/+7
| | | | | |
| | | | | * Update documentation and config filesKamil Trzcinski2015-09-1642-1543/+116
| | | | | |
| | | | | * Start working on migration docsKamil Trzcinski2015-09-161-0/+0
| | | | | |
| | | | | * Add rake task for easy migration of SQL dumpsKamil Trzcinski2015-09-163-27/+159
| | | | | |
| | | | | * Fix backup testsKamil Trzcinski2015-09-163-4/+5
| | | | | |
| | | | | * Fix: models/ci/project_spec.rb once againKamil Trzcinski2015-09-151-1/+1
| | | | | |
| | | | | * Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2015-09-1511-73/+80
| | | | | |\ | |_|_|_|_|/ |/| | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
* | | | | | Merge branch 'fix-upload-ui' into 'master'Stan Hu2015-09-1511-73/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup some html/css for upload feature * fix colors to match UI style * cleanup templates from meaningless code * improve placeholders * remove code duplication in template * improve error handling: remove file automatically Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #2520 See merge request !1297
View Lorry Controller Status