summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update ssh doc with commands to copy the public key to the clipboardHannes Rosenögger2015-01-221-1/+18
|
* Merge branch 'protected_branches' into 'master'Dmitriy Zaporozhets2015-01-219-40/+80
|\ | | | | | | | | | | | | | | Developer can push to protected branch if allowed #1876 See merge request !1418
| * developer can push to protected branchesValery Sizov2015-01-209-40/+80
|/
* Merge branch 'github_importer' into 'master'Dmitriy Zaporozhets2015-01-205-9/+34
|\ | | | | | | | | | | | | | | Github importer: AJAX update status #1907 See merge request !1417
| * Github Importer: AJAX update statusValery Sizov2015-01-205-9/+34
| |
* | We dont support ruby 2.2 yetDmitriy Zaporozhets2015-01-201-1/+1
|/
* Merge pull request #8603 from jubianchi/hook-merge-request-actionDmitriy Zaporozhets2015-01-2012-19/+141
|\ | | | | Add action property to merge request hook
| * Add action property to merge request hookjubianchi2015-01-2012-19/+141
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-01-191-0/+1
|\ \
| * \ Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-01-201-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | print validation errors when gitlab-rake gitlab:import:repos fails for project Currently, when gitlab-rake gitlab:import:repos is not able to import a project it justs prints "Failed trying to create project" to the console. There seems to be no way to find out what exactly has failed. Since the check uses validation, it should at least print the validation issues. That might be a bit cryptic, but may be better than leaving the user in the dark completely. See merge request !147
| | * | print validation errors when import failsBastian Krol2014-07-091-0/+1
| | | |
* | | | Merge branch 'github_importer_feature_desc' into 'master'Dmitriy Zaporozhets2015-01-204-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Github importer feature desc @job Can you take a look? See merge request !1414
| * | | | GitHub importer descriptionValery Sizov2015-01-194-0/+14
| |/ / /
* | | | Merge branch 'border-radius-fixx' into 'master'Dmitriy Zaporozhets2015-01-201-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Border radius fixx Fixes the border radius in the description box. See merge request !1416
| * | | fix border radius top left for descriptionsJob van der Voort2015-01-191-1/+2
|/ / /
* | | Merge pull request #8585 from duduribeiro/fix_email_in_ssh_help_pageDmitriy Zaporozhets2015-01-192-1/+14
|\ \ \ | | | | | | | | Fix the email variable substituation in ssh help page
| * | | Change to single-quoted strings in help_pages_specCarlos Ribeiro2015-01-181-4/+4
| | | |
| * | | Fix the email variable substituation in ssh help pageCarlos Ribeiro2015-01-152-1/+14
| | | |
* | | | Merge branch 'update_doc_github_importer1' into 'master'Valery Sizov2015-01-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update doc github importer. See merge request !1413
| * | | | fix url in update docValery Sizov2015-01-191-1/+1
|/ / / /
* | | | Merge branch 'update_doc_github_importer' into 'master'Valery Sizov2015-01-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update doc github importer See merge request !1412
| * | | | fix url in update docValery Sizov2015-01-191-1/+1
|/ / / /
* | | | Merge branch 'update_oauth_documentation' into 'master'Dmitriy Zaporozhets2015-01-193-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update oauth documentation See merge request !1411
| * | | | update documentation regarding github_importerValery Sizov2015-01-193-1/+6
| | | | |
* | | | | Merge branch 'spinach_admin_application' into 'master'Dmitriy Zaporozhets2015-01-194-1/+78
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | Spinach admin application See merge request !1410
| * | | | Spinach for admin applicationsValery Sizov2015-01-194-1/+78
| | | | |
* | | | | Merge branch 'database-fix-setting' into 'master'Marin Jankovski2015-01-191-19/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for database connection when running current_application_settings The PG connection errors don't always end up being caught as ActiveRecord::NoDatabaseError. So when doing a precompile without the database (like when using the omnibus), an exception was being thrown. See merge request !292
| * | | | Check for database connection before loading current application settingsDJ Mountney2015-01-141-19/+4
| | | | |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-01-181-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge pull request #8040 from drag00n/updatedhintDrew Blessing2015-01-181-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Use full path from root of project.
| | * | | | | Use full path from root of project.drag00n2015-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove markdown syntax from config file
* | | | | | | Dont allow event content to overflow it UI limitsDmitriy Zaporozhets2015-01-181-1/+3
|/ / / / / /
* | | | | | Reduce sidebar width by 10pxDmitriy Zaporozhets2015-01-182-3/+10
| | | | | |
* | | | | | Fix tests for edited_ago helpersDmitriy Zaporozhets2015-01-181-2/+2
| | | | | |
* | | | | | Votes block has less priority than assignee/milestoneDmitriy Zaporozhets2015-01-182-8/+8
| | | | | |
* | | | | | Few improvements to mobile UIDmitriy Zaporozhets2015-01-182-0/+8
| | | | | |
* | | | | | Improve edited ago helpersDmitriy Zaporozhets2015-01-182-4/+8
| | | | | |
* | | | | | Fix testsDmitriy Zaporozhets2015-01-181-1/+6
| | | | | |
* | | | | | Fix comment text overflow and wrong marginDmitriy Zaporozhets2015-01-181-1/+5
| | | | | |
* | | | | | Merge branch 'hipchat_placeholder' into 'master'Dmitriy Zaporozhets2015-01-181-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add placeholder values to hipchat service This MR adds placeholder values to the hipchat service. This should prevent issues like #279 or #772 that popped up because people didn't know what exactly they are supposed to enter in the fields. See merge request !294
| * | | | | | Add placeholders to hipchat serviceHannes Rosenögger2015-01-171-2/+2
| | | | | | |
* | | | | | | Merge branch 'syntax_highlight_diff_email' into 'master'Dmitriy Zaporozhets2015-01-184-3/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add syntax colors to diffs in email-on-push notifications ## What does this MR do? This MR adds syntaxhighlighting to the email-on-push notifications. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Currently the diff in email-on-push notifications is just a monochrome diff that's hard to read. This MR adds colored syntaxhighlighting to the mails. ## What are the relevant issue numbers / Feature requests? * It closes https://github.com/gitlabhq/gitlabhq/issues/6994 * There is a Discussion in the Feedback Forum: http://feedback.gitlab.com/forums/176466-general/suggestions/5802256-add-color-to-diffs-in-email-on-push-service-to-htm * A pull request for this already existed, but was closed. https://github.com/gitlabhq/gitlabhq/pull/7739 ## Screenshots see prior Pull Request for a screenshot See merge request !295
| * | | | | | | Add Diff syntax colors for email-on-push notificationsHannes Rosenögger2015-01-174-3/+13
| |/ / / / / /
* | | | | | | Merge branch 'project_search_case_insensitive' into 'master'Dmitriy Zaporozhets2015-01-182-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make search for projects case insensitive ### What does this MR do? This MR makes the search for projects case insensitive. ### Why was this MR needed? Currently the search for projects is case sensitive. You can test this on gitlab.com with the search string "perforce" for example. * perforce returns 2 projects * Perforce returns 5 projects * PERFORCE returns 0 projects This makes it harder to find the projects you are looking for. With this MR users can find more projects, since they don't need to worry about not seeing some projects just because of an upper letter. @dblessing Can you take a look at this? :) See merge request !296
| * | | | | | | Make the project search case insensitiveHannes Rosenögger2015-01-182-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-01-183-1/+9
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fix_sort_dropdown_style' into 'master'Dmitriy Zaporozhets2015-01-182-1/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix sort dropdown partially not showing on screen. This MR fixes the sort dropdown menu partially not showing on the screen. Closes gitlab-org/gitlab-ce#986 Screenshot of the Problem: ![Problem](https://gitlab.com/uploads/gitlab-org/gitlab-ce/8d442e872c/Screenshot_from_2015-01-17_15_18_41.png) @dzaporozhets Can you take a look at this? See merge request !299
| | * | | | | | | | Fixes the sort dropdown goind outside of the screenHannes Rosenögger2015-01-172-1/+6
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | see gitlab-org/gitlab-ce#986
| * | | | | | | | Merge branch 'wip-documentation' into 'master'Robert Schilling2015-01-181-0/+3
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add description to merge request API documentation See merge request !301
| | * | | | | | | Add description to merge requestLoic Dachary2015-01-181-0/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The description can be provided when creating or updating a merge request. Signed-off-by: Loic Dachary <loic@dachary.org>
View Lorry Controller Status