summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Changed the placeholder text and modified the css class to make it visibleplaceholder_textDarby2015-06-163-24/+8
|
* Merge branch 'fix-gitlab-ci-yml' into 'master'Dmitriy Zaporozhets2015-06-153-12/+19
|\ | | | | | | | | | | | | | | | | | | Look for .gitlab-ci.yml only if checkout_sha is present Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2396 cc @vsizov See merge request !818
| * Look for .gitlab-ci.yml only if checkout_sha is presentfix-gitlab-ci-ymlDmitriy Zaporozhets2015-06-152-10/+14
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Dont set checkout sha for removed branch/tagDmitriy Zaporozhets2015-06-151-2/+5
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'blog-post-in-advance' into 'master'Job van der Voort2015-06-151-2/+4
|\ | | | | | | | | | | | | | | Prepare blog post in advance Prepare the blog posts template directly after merging the old one. This way people can add add items that should not be forgotten during the month. See merge request !816
| * Prepare blog post in advanceSytse Sijbrandij2015-06-151-2/+4
| |
* | Merge branch 'fix-ext-issue-tracker-hook' into 'master'Dmitriy Zaporozhets2015-06-152-10/+6
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix external issue tracker hook/test for HTTPS URLs If HTTPS was used for the 'project_url' of an external issue tracker, an error was raised because a HTTP connection was established to the default HTTPS port. The code has been corrected and simplified by using HTTParty. Additionally, the request now is made directly to the 'project_url' instead of the extracted root path. ## The bug is reproducible on gitlab.com 1. Set up a new external issue service (I used Redmine) 2. Set the project URL to 'http://example.com/redmine/projects/x' and click on 'Test settings' => Ok 3. Now set the URL to 'https://example.com/redmine/projects/x' and test it again => 500 ## What is actually happening? Web servers behave differently when a non-SSL connection is established to a SSL port: - Nginx / Apache 2.4: Status code 400 - Apache 2.2: <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">... (no status code line is sent) - example.com: Empty response, no status code line ## Relevant log entries ``` 2015-06-04T11:10:47.972Z 16785 TID-exfks WARN: {"retry"=>true, "queue"=>"project_web_hook", "class"=>"ProjectServiceWorker", "args"=>[...], "error_message"=>"wrong status line: \"<!DOCTYPE HTML PUBLIC \\\"-//IETF//DTD HTML 2.0//EN\\\">\"", "error_class"=>"Net::HTTPBadResponse", ...} 2015-06-04T11:10:47.972Z 16785 TID-exfks WARN: wrong status line: "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">" 2015-06-04T11:10:47.972Z 16785 TID-exfks WARN: /usr/lib/ruby/2.1.0/net/http/response.rb:41:in `read_status_line' [...] /home/git/gitlab-7.11.4/app/models/project_services/issue_tracker_service.rb:88:in `execute' /home/git/gitlab-7.11.4/app/workers/project_service_worker.rb:8:in `perform' [...] ``` See merge request !767
| * Fix external issue tracker hook/test for HTTPS URLsdgerhardt/gitlab-ce-fix-ext-issue-tracker-hookDaniel Gerhardt2015-06-052-10/+6
| | | | | | | | | | | | | | | | | | If HTTPS was used for 'project_url', an error was raised because a HTTP connection was established to the default HTTPS port. The code has been corrected and simplified by using HTTParty. Additionally, the request now is made directly to the 'project_url' instead of the extracted root path.
* | Fix text align in last push eventDmitriy Zaporozhets2015-06-151-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'update_ssl_ciphers' into 'master'Dmitriy Zaporozhets2015-06-152-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ssl ciphers Removing all DHE suites from Nginx template SSL ciphers. This will deny forward secrecy for Android 2.3.7, Java 6 and OpenSSL 0.9.8. but will give A+ rating on SSL labs. Google sites also do not have DHE suites, [source](https://community.qualys.com/blogs/securitylabs/2013/06/25/ssl-labs-deploying-forward-secrecy) > Google's sites, for example, tend to not have any DHE suites in their configuration. [2013] See merge request !814
| * | Update SSL ciphers per logjam vulnerability recommendations.update_ssl_ciphersMarin Jankovski2015-06-152-1/+2
| | |
* | | Merge branch 'rs-dev-issue-2228' into 'master'Dmitriy Zaporozhets2015-06-1561-412/+901
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Allow user to customize default Dashboard page Renames the "Design" profile page to "Preferences" and adds a field to customize the default Dashboard page: > ![Screen_Shot_2015-06-11_at_11.12.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5282a3be7861d1148528c6bc9e7a0e0/Screen_Shot_2015-06-11_at_11.12.53_PM.png) See merge request !778
| * | Move CHANGELOG item to 7.13Dmitriy Zaporozhets2015-06-151-3/+5
| | |
| * | Fix doc typosrs-dev-issue-2228Robert Speicher2015-06-151-7/+6
| | |
| * | Add `allowing_for_delay` helper method for feature specsRobert Speicher2015-06-142-6/+41
| | |
| * | Refactor RootControllerRobert Speicher2015-06-131-2/+12
| | |
| * | Refactor dashboard_choicesRobert Speicher2015-06-132-21/+26
| | |
| * | Remove redundant help text from custom dashboard selectionRobert Speicher2015-06-131-2/+0
| | |
| * | Fix alignment of Behavior form; add documentation linkRobert Speicher2015-06-131-2/+4
| | |
| * | CHANGELOG for custom Dashboard pageRobert Speicher2015-06-131-0/+2
| | |
| * | Move 2FA docs from "Workflow" to "Profile Settings"Robert Speicher2015-06-137-20/+20
| | |
| * | Add docs for Profile > PreferencesRobert Speicher2015-06-133-35/+72
| | | | | | | | | | | | Also converts doc/README.md to Unix line endings
| * | Spec the failure cases for PreferencesController#updateRobert Speicher2015-06-132-6/+27
| | |
| * | Make the dashboard choice text match the text in the sidebarRobert Speicher2015-06-132-4/+4
| | |
| * | Add feature specs for default dashboard preferenceRobert Speicher2015-06-133-10/+54
| | |
| * | Add a form field to customize the dashboard preferenceRobert Speicher2015-06-133-2/+53
| | |
| * | Account for RootController for dashboard navigation and Dispatch JSRobert Speicher2015-06-132-2/+2
| | |
| * | Add RootControllerRobert Speicher2015-06-135-4/+60
| | | | | | | | | | | | | | | | | | This controller is now the target for `root_url`. It sub-classes DashboardController so we can render the old default without a redirect if the user hasn't customized their dashboard location.
| * | Add `dashboard` attribute to User modelRobert Speicher2015-06-136-3/+22
| | |
| * | Update markup/styling for syntax highlight theme preferenceRobert Speicher2015-06-132-9/+7
| | |
| * | Simplify the javascript behavior for Preference updatingRobert Speicher2015-06-134-14/+18
| | |
| * | Fix a few remaining references to the old Theme names/IDsRobert Speicher2015-06-133-8/+9
| | |
| * | Remove js handler from Profiles#updateRobert Speicher2015-06-131-1/+0
| | | | | | | | | | | | | | | It was only used for the appearance live updating, which is now handled by Profiles::Preferences#update
| * | Add PreferencesHelper moduleRobert Speicher2015-06-138-55/+90
| | | | | | | | | | | | | | | | | | | | | Consolidates the helpers related to user preferences. Renames `app_theme` to `user_application_theme` to better explain what it is.
| * | Add Gitlab::Themes module; remove Gitlab::ThemeRobert Speicher2015-06-1310-97/+136
| | | | | | | | | | | | | | | | | | | | | Now we can simply loop through all themes, among other things. This also removes the `dark_theme` / `light_theme` classes and the `theme_type` helper, since they weren't used anywhere.
| * | Consolidate theme stylesheets into oneRobert Speicher2015-06-1311-107/+106
| | | | | | | | | | | | | | | | | | | | | | | | Since they're all defined by a mixin, it didn't provide any benefit to have them in separate files. This also adds variables defining the basic color of each theme so we can re-use them in the previews.
| * | Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-1311-105/+112
| | |
| * | Allow login_as helper to accept a User objectRobert Speicher2015-06-131-4/+20
| | |
| * | Add Profiles::PreferencesControllerRobert Speicher2015-06-1311-15/+127
| | |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-06-158-18/+41
|\ \ \
| * \ \ Merge branch 'remove-visibility-icons' into 'master'Douwe Maan2015-06-153-6/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove visibility icon from projects list on dashboard and group page ## Why? Because * visibility level show on project page anyway * it does not have much value. Main purpose of project list on dashboard is navigation. Avatar + project name helps this goal. Visibility icon have no effect here * it makes UI worse because it brings separation between project avatar and name * without visibility icon we have more space for project name. Especially important for laptops ## Screenshot ![Screenshot_2015-06-12_18.17.20](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0e572388e9a337c5a535813911d08c89/Screenshot_2015-06-12_18.17.20.png) P.S. Merge when 7-12-stable is created See merge request !806
| | * | | Remove visibility icon from projects list on dashboard and group pageremove-visibility-iconsDmitriy Zaporozhets2015-06-123-6/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'fix-post-receive-external-tracker' into 'master'Douwe Maan2015-06-155-11/+37
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix post-receive errors on a push when an external issue tracker is configured ### What does this MR do? This MR improves upon !766, fixing errors upon a git push that occur only when an external issue tracker (not JIRA) is used. This MR takes into account that external issue trackers, such as JIRA, may close issues. Disabling the processing of post-receive commits when an external issue tracker is configured seems like the wrong behavior. ### Why was this MR needed? When a user adds an issue reference, the refactoring in 8f8a8ab and a6defd157 caused `project.get_issue` to be called, causing `ExternalIssue` to be returned when an external issue tracker was configured. This object does not have a `close` method, as needed in `CloseService`. Nor does it make sense to associate a `SystemNote` with this object. GitLab EE uses a [special case for JIRA](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/services/git_push_service.rb#L87). I would recommend moving this logic into `CloseService` too. ### What are the relevant issue numbers? * Closes #1700 * Closes #1720 See merge request !804
| | * | | | Fix post-receive errors on a push when an external issue tracker is configuredStan Hu2015-06-125-11/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1700 Closes #1720
| * | | | | Merge branch 'update-irker-home' into 'master'Robert Schilling2015-06-151-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Irker home page [ci skip] Closes #1713 See merge request !812
| | * | | | | Update Irker home pageStan Hu2015-06-141-1/+1
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Closes #1713
* | | | | | Merge branch 'remove_all_projects_button' into 'master'Douwe Maan2015-06-151-3/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove button to all projects on Trending Projects page. Fixes #2001. See merge request !1860
| * | | | | Remove button to all projects on Trending Projects page.Nicolas2015-06-141-3/+0
|/ / / / / | | | | | | | | | | | | | | | Fixes #2001.
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-1418-77/+75
|\ \ \ \ \
| * \ \ \ \ Merge branch 'rs-issue-1432' into 'master'Dmitriy Zaporozhets2015-06-142-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Redcarpet to 3.3.0 Fixes #1432 See merge request !809