summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Fix layout issue in header title truncation.Nicolas2015-06-164-17/+14
| |/ / /
* | | | Merge branch 'applications_form' into 'master'Douwe Maan2015-06-164-15/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix UI issues in Applications form @douwe Thanks for reviewing this small fix. --- Before: ![application_form_before](https://dev.gitlab.org/gitlab/gitlabhq/uploads/11fbee17ad6a4c9456cd7d6cba5ae429/application_form_before.png) --- After: ![application_form_after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/0c64214ccda6c77095f468fcb8c748f3/application_form_after.png) See merge request !1859
| * | | | Fix consistency issues on New Application page.Nicolas2015-06-153-4/+10
| | | | |
| * | | | Fix layout issue when New Application validation fails.Nicolas2015-06-151-10/+15
| | | | |
| * | | | Highlight Applications nav item when validation fails.Nicolas2015-06-141-1/+1
| | |/ / | |/| |
* | | | Merge branch 'update-release-doc' into 'master'Job van der Voort2015-06-161-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update release doc See merge request !1865
| * | | | Add 'build RC1 packages' to monthly release stepsJacob Vosmaer2015-06-151-0/+1
| | | | |
| * | | | The changelogs are kept up to date continuouslyJacob Vosmaer2015-06-151-3/+0
| | | | |
* | | | | Merge branch 'db-dump-instructions' into 'master'Dmitriy Zaporozhets2015-06-161-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve DB dump instructions See merge request !1868
| * | | | | Improve DB dump instructionsJacob Vosmaer2015-06-161-0/+5
| |/ / / /
* | | | | Merge branch 'new_syntax_yaml' into 'master'Valery Sizov2015-06-161-25/+37
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | New syntax of .gitlab-ci.yml See merge request !1862
| * | | | new syntax of .gitlab-ci.ymlValery Sizov2015-06-151-25/+37
|/ / / /
* | | | 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
| | | | |