summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
| * | | | | | Change the replace placeholder to use the filenamefix-upload-uiStan Hu2015-09-158-60/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamically adjust placedholder for uploads and fix Dropzone event handlers Override error handler to prevent error messages from being inserted underneath image preview Fix tests Use regexp instead of startsWith for better browser compatibility Remove duplicate code in _replace.html.haml and use one template Remove files upon error and retain alert messages until user adds a new file
| * | | | | | Improve wording for header and placeholdersRobert Schilling2015-09-153-7/+7
| | | | | | |
| * | | | | | Cleanup some html/css for upload featureDmitriy Zaporozhets2015-09-156-18/+27
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | | | * Fix models/ci/mail_service_spec.rbKamil Trzcinski2015-09-153-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change Notify to Ci::Notify - Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables
| | | | | * Revert "Fix: models/ci/mail_service_spec.rb"Kamil Trzcinski2015-09-151-18/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 345ff6cbf93eca5d61218f28d5f4d9eb2d4abf67. This requires sidekiq >= 3.4 and fixed all other CE tests
| | | | | * Fix builds directory storeKamil Trzcinski2015-09-152-5/+9
| | | | | |
| | | | | * Remove gitlab_ci_meta from gemsKamil Trzcinski2015-09-152-4/+1
| | | | | |
| | | | | * Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2015-09-15115-456/+959
| | | | | |\ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
* | | | | | Merge branch 'slack-help-text' into 'master'Drew Blessing2015-09-151-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a help text to the Slack Service When setting up the service I was not sure which webhook I should use, by adding this Help text I hope we can help people in the future with setting up this hook See merge request !1302
| * | | | | Add a help text to the Slack ServiceJeroen van Baarsen2015-09-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting up the service I was not sure which webhook I should use, by adding this Help text I hope we can help people in the future with setting up this hook Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | | | Merge pull request #9632 from szechyjs/update-fogbugz-gemStan Hu2015-09-153-9/+7
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / Use fixed version of fogbugz gem
| * | | | Use fixed version of fogbugz gemJared Szechy2015-09-153-9/+7
|/ / / / | | | | | | | | | | | | This allows us to properly handle authentication errors.
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Speicher2015-09-151-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #9630 from fscherwi/patch-1Robert Schilling2015-09-151-1/+1
| |\ \ \ \ | | | | | | | | | | | | change coverage image to svg [ci skip]
| | * | | | change coverage image to svg [ci skip]fscherwi2015-09-151-1/+1
| |/ / / /
* | | | | Merge branch 'rs-update-guide' into 'master'Robert Speicher2015-09-151-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorder the `--without` arugments so the database comes first Hopefully this will make it a bit clearer that we're excluding a certain database type. [ci skip] See merge request !1301
| * | | | | Reorder the `--without` arugments so the database comes firstRobert Speicher2015-09-151-4/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully this will make it a bit clearer that we're excluding a certain database type. [ci skip]
* | | | | Merge branch 'rs-update-guide' into 'master'Robert Speicher2015-09-151-27/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor editing of the 7.14-to-8.0 update guide [ci skip] See merge request !1300
| * | | | | Minor editing of the 7.14-to-8.0 update guideRobert Speicher2015-09-151-27/+41
|/ / / / /
* | | | | Merge branch 'fix_empty_project' into 'master'Dmitriy Zaporozhets2015-09-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix empty project UI In an empty project, the 'project is empty' light well was mashed up against the project panel. The light well have 16px margin so there was some white space along the edges that looked funny. This MR makes the 'project is empty' text block a `gray-content-area` which fits nicely with the rest of the UI. **Current:** ![Screen_Shot_2015-09-14_at_11.20.47_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/07b39641f602e01440dd5558a0d80237/Screen_Shot_2015-09-14_at_11.20.47_AM.png) **As proposed:** ![Screen_Shot_2015-09-14_at_11.20.29_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/1c3b1d73584c68a88cd1b0fcf3d6ea5b/Screen_Shot_2015-09-14_at_11.20.29_AM.png) See merge request !1291
| * | | | | Fix empty project UIDrew Blessing2015-09-141-1/+1
| | | | | |
* | | | | | Merge branch 'import-in-progress-fix' into 'master'Dmitriy Zaporozhets2015-09-151-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't display "git clone --bare <URL>" if no URL is available Make it clear that forking is different than importing. Forked repositories don't use `import_url`, so only display if is available. Introduced in !1231 Before: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d8456334a2a9187b56a885f8849f229e/image.png) After: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9823e8a2baf02859c4c3f05f3a5c35bf/image.png) See merge request !1295
| * | | | | | Display "Forking in Progress" when importing a forked projectStan Hu2015-09-151-2/+5
| | | | | | |
| * | | | | | Don't display "git clone --bare <URL>" if no URL is availableStan Hu2015-09-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in !1231
* | | | | | | Merge branch 'update-gitlab-emoji' into 'master'Marin Jankovski2015-09-151-5/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab_emoji to 0.1.1 See merge request !1290
| * | | | | | Update gitlab_emoji to 0.1.1Robert Schilling2015-09-141-5/+2
| | | | | | |
* | | | | | | Merge branch 'ui-fixes' into 'master'Dmitriy Zaporozhets2015-09-156-27/+49
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Improve UI for last push widget and web editor See merge request !1296
| * | | | | | Fix UI for web editorDmitriy Zaporozhets2015-09-153-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status