summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Don't notify users without access to the project when they are ↵dont-notify-users-without-project-accessDouwe Maan2015-08-263-5/+18
| | | | (accidentally) mentioned in a note.
* Merge branch 'update-changelog-for-7.14.1' into 'master'Robert Speicher2015-08-261-3/+3
|\ | | | | | | | | | | | | | | Update CHANGELOG for released 7.14.1 [ci skip] See merge request !1211
| * Update CHANGELOG for released 7.14.1Stan Hu2015-08-261-3/+3
| | | | | | | | [ci skip]
* | Merge branch 'prevent-too-many-redirects-on-signin' into 'master'Dmitriy Zaporozhets2015-08-262-1/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent too many redirects error when home page URL set to external_urll Many users naively set the home page URL setting to external_url (e.g. https://mydomain.com). When an unauthenticated user signs in, this causes endless redirections. For example, this is occuring: 1. Unauthenticated user attempts to access https://mydomain.com/dashboard 2. Application redirects to the home page URL: https://mydomain.com 3. Repeat step 2 In step 3, ApplicationController should have redirected the user to https://mydomain.com/users/sign_in. Disabling the redirection if home page URL is the same as external_url prevents users from messing up. * Closes https://github.com/gitlabhq/gitlabhq/issues/8843 * Closes #2057 See merge request !1210
| * | Prevent too many redirects error when home page URL set to external_urllStan Hu2015-08-262-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many users naively set the home page URL setting to external_url (e.g. https://mydomain.com). When an unauthenticated user signs in, this causes endless redirections. For example, this is occuring: 1. Unauthenticated user attempts to access https://mydomain.com/dashboard 2. Application redirects to the home page URL: https://mydomain.com 3. Repeat step 2 In step 3, ApplicationController should have redirected the user to https://mydomain.com/users/sign_in. Disabling the redirection if home page URL is the same as external_url prevents users from messing up. Closes https://github.com/gitlabhq/gitlabhq/issues/8843 Closes #2057
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-2617-118/+105
|\ \ \
| * \ \ Merge branch 'fluid-fixed-layout' into 'master'Dmitriy Zaporozhets2015-08-2615-108/+90
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit content width for big screens except certain pages - [x] limit content width to 1200px - [x] align header with head - [x] set full-width for split diff pages Fixes #2353 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1207
| | * | Fix header for anonymous users toofluid-fixed-layoutDmitriy Zaporozhets2015-08-261-6/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Align header with content containerDmitriy Zaporozhets2015-08-266-81/+67
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Limit content width for big screens except certain pagesDmitriy Zaporozhets2015-08-2610-21/+22
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'blame_fix' into 'master'Dmitriy Zaporozhets2015-08-262-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve perofrmance of git blame https://gitlab.com/gitlab-org/gitlab-ce/issues/2286 Now, it's four times as faster. See merge request !1209
| | * | | Improve perofrmance of git blameValery Sizov2015-08-262-1/+2
| |/ / /
| * | | Merge branch 'bar-graphs' into 'master'Dmitriy Zaporozhets2015-08-262-9/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change plots to bar graphs Since line plot does not make sense for this kind of plots, change them to bar graphs. Bar graphs are easier to read and they look cool too. I would like to change commits per author plots to bar graphs too, but code looks too messy to modify. See merge request !645
| | * | | Add changelog entryJosef Kufner2015-08-251-0/+1
| | | | |
| | * | | Change plots to bar graphsJosef Kufner2015-08-251-9/+12
| | |/ /
* | | | Merge branch 'fix' into 'master' Job van der Voort2015-08-261-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fixed text about HTTP Fixed for text to be more clear. Because of tweet https://twitter.com/mystygage/status/630798770012323840 See merge request !1921
| * | | deleted linekaren Carias2015-08-171-2/+1
| | | |
| * | | fixed textkaren Carias2015-08-101-2/+3
| | | |
* | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-08-265-7/+10
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Ui improvements * Improve project name/description look on project page * Increase width of sidebar for several pages See merge request !1206
| * | | Increase width of sidebar for several pagesDmitriy Zaporozhets2015-08-263-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Improve project name/description look on project pageDmitriy Zaporozhets2015-08-262-1/+4
| | |/ | |/| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fix-reply-by-email-init' into 'master'Robert Speicher2015-08-251-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | Fix init script for Reply by email See merge request !1202
| * | | Fix init script for Reply by emailDouwe Maan2015-08-251-1/+1
| | | |
* | | | Merge branch 'dropdown-positioning' into 'master'Dmitriy Zaporozhets2015-08-253-1/+6
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI Improvement for the project page This MR improves the positioning of the dropdown menu on the project page. I've added the WIP because I didn't check if this can cause any tests to break. I'll remove it once the CI is green. Before: ![gitlab_dropdown_old](https://gitlab.com/haynes/gitlab-ce/uploads/ac30810abe9e75154edd2a896c9a4947/gitlab_dropdown_old.png) After: ![gitlab_dropdown_new](https://gitlab.com/haynes/gitlab-ce/uploads/616c237fe26934ebbbc82f0ce73e72da/gitlab_dropdown_new.png) This is the MR for the discussion in gitlab-org/gitlab-ce!971 . /cc @dzaporozhets Can you review it please? :smiley: See merge request !1199
| * | | UI Improvement for the project pageHannes Rosenögger2015-08-253-1/+6
| | | | | | | | | | | | | | | | This commit improves the positioning of the dropdown menu on the project page.
* | | | Merge branch 'separate-activity' into 'master'Dmitriy Zaporozhets2015-08-256-39/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-use project partial for rendering explore projects from dashboard For consistency with projects on dashboard after !1198 Before: ![Screenshot_2015-08-25_18.21.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/53bcf6909fe55b2e331ea6a720cb12ce/Screenshot_2015-08-25_18.21.48.png) After: ![Screenshot_2015-08-25_18.20.22](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fbda93828ec28ef1ac874d65b4a04c2b/Screenshot_2015-08-25_18.20.22.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1200
| * | | | Re-use project partial for rendering explore projectsDmitriy Zaporozhets2015-08-256-39/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'rs-re-enable-user-reference-spec' into 'master'Douwe Maan2015-08-251-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable the "links with adjacent text" UserReferenceFilter spec See merge request !1194
| * | | | | Re-enable the "links with adjacent text" UserReferenceFilter specrs-re-enable-user-reference-specRobert Speicher2015-08-241-1/+0
| | | | | |
* | | | | | Merge branch 'separate-activity' into 'master'Dmitriy Zaporozhets2015-08-2518-67/+95
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate activity page Move activity to separate page. Part of #2225 ![Screenshot_2015-08-25_15.07.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2126b22ed7b98a2f748c96ad60bc8b2e/Screenshot_2015-08-25_15.07.23.png) See merge request !1198
| * | | | Fix tests and last push widgetseparate-activityDmitriy Zaporozhets2015-08-257-8/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Make some visual improvements to dashboard page after we moved activityDmitriy Zaporozhets2015-08-257-44/+46
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Dashboard activity as separate pageDmitriy Zaporozhets2015-08-256-16/+30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'fix-reload-with-full-diff-in-compare-branch' into 'master'Dmitriy Zaporozhets2015-08-254-1/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Reload with full diff" URL button in compare branch view This button worked when viewing merge requests because the JavaScript stripped the .html in the Ajax request. However, it left the .html suffix in the compare branch view. See merge request !1195
| * | | | | Fix "Reload with full diff" URL button in compare branch viewStan Hu2015-08-244-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This button worked when viewing merge requests because the JavaScript stripped the .html in the Ajax request. However, it left the .html suffix in the compare branch view.
* | | | | | Merge branch 'improve-abuse-reports' into 'master'Dmitriy Zaporozhets2015-08-255-8/+23
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve abuse reports management * Link to user profile instead of user admin page * One button for remove user and report * Remove user and report without page reloading Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1196
| * | | | | Fix remove report buttonimprove-abuse-reportsDmitriy Zaporozhets2015-08-252-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Improve abuse reports managementDmitriy Zaporozhets2015-08-254-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Link to user profile instead of user admin page * One button for remove user and report * Remove user and report with page reloading Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'handle-smtp-input-errors' into 'master'Dmitriy Zaporozhets2015-08-253-14/+54
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to prevent Sidekiq retries ### What does this MR do? This MR gracefully handles SMTP input errors (e.g. incorrect or invalid e-mail addresses) to prevent these types of exceptions from causing Sidekiq to retry the task. If these specific exceptions occur, they will be logged, and the e-mail will be dropped from the queue. ### Why was this MR needed? If you include an author that has a misspelled e-mail address, Sidekiq will keep sending e-mail to all the recipients even if they have already received the e-mail. The only way to recover is to clear the Sidekiq queue. Note that other exceptions can still be thrown (e.g. `IOError`, `Net::SMTPAuthenticationError`, `Net::SMTPServerBusy`, `Net::SMTPUnknownError`, and `TimeoutError`). If the worker encounters these, Sidekiq should retry the task. ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9560 See merge request !1163
| * | | | | | Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to ↵Stan Hu2015-08-193-14/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent Sidekiq retries Closes https://github.com/gitlabhq/gitlabhq/issues/9560
* | | | | | | Merge branch 'upgrade-browser-gem' into 'master'Dmitriy Zaporozhets2015-08-253-3/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode GitLab currently displays the "outdated browser" message if users run Internet Explorer 11 in Compatibility Mode. @fnando [updated the browser gem](https://github.com/fnando/browser/pull/168) to use IE's Trident version to determine the "true" version of IE11. Closes #2271 See merge request !1188
| * | | | | | Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty modeStan Hu2015-08-233-3/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Closes #2271
* | | | | | Merge branch 'reply-by-email-improvements' into 'master'Robert Speicher2015-08-244-0/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore empty incoming messages (Reply by email) We should also update mail_room when https://github.com/tpitale/mail_room/pull/35 goes in, but that can wait a bit. See merge request !1190
| * | | | | Ignore empty incoming messages.Douwe Maan2015-08-244-0/+10
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs-changelog-update' into 'master'Robert Speicher2015-08-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move changelog entry to 7.14.1 [ci skip] See merge request !1192
| * | | | | Move changelog entry to 7.14.1Robert Speicher2015-08-241-1/+1
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'rs-7-14-1-changelog' into 'master'Douwe Maan2015-08-241-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move full_host fix changelog entry to 7.14.1 [ci skip] See merge request !1191
| * | | | | Move full_host fix changelog entry to 7.14.1Robert Speicher2015-08-241-1/+3
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'fix-relative-url-omniauth' into 'master'Robert Speicher2015-08-243-9/+20
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only include base URL in OmniAuth full_host parameter Closes #2335 See merge request !1187
| * | | | Only include base URL in OmniAuth full_host parameterStan Hu2015-08-233-9/+20
| | | | | | | | | | | | | | | | | | | | Closes #2335