summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* markdown fixesnew-markdownAndriy Dyadyura2016-01-051-1/+1
|
* markdown fixesAndriy Dyadyura2016-01-051-3/+3
|
* Merge branch 'show-all-builds-by-default' into 'master' Robert Speicher2016-01-044-17/+17
|\ | | | | | | | | | | | | Show all builds by default in the builds page Fixes #4240 See merge request !2243
| * Show 'All' tab by default in the builds pageshow-all-builds-by-defaultDouglas Barbosa Alexandre2016-01-044-17/+17
| |
* | Merge branch 'rs-issue-201' into 'master' Dmitriy Zaporozhets2016-01-041-1/+4
|\ \ | | | | | | | | | | | | | | | | | | Prevent duplicate "username has already been taken" validation message Closes #201 - two-year-old bug, woo! :boom: :tada: See merge request !2279
| * | Prevent duplicate "username has already been taken" validation messagers-issue-201Robert Speicher2016-01-021-1/+4
| | | | | | | | | | | | Closes #201 - two-year-old bug, woo! :boom: :tada:
* | | Merge branch 'reverting-rs-remove-jquery-blockui' into 'master' Dmitriy Zaporozhets2016-01-041-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'rs-remove-jquery-blockui' into 'master'" This reverts commit bc12750fcc7a8637771e1449493cdd3cee9ebd64, reversing changes made to 8a04b84e09c4318ac46808d0debc4997b52a2314. See merge request !2285
| * | | Revert "Merge branch 'rs-remove-jquery-blockui' into 'master' "reverting-rs-remove-jquery-blockuiJacob Schatz2016-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit bc12750fcc7a8637771e1449493cdd3cee9ebd64, reversing changes made to 8a04b84e09c4318ac46808d0debc4997b52a2314.
* | | | Merge branch 'extra-system-hooks' into 'master' Stan Hu2016-01-043-1/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added system hooks messages for renaming and transferring a project This is work in progress but I wanted to get some feedback on it in case there is something I've missed or a better way to do it. As the title says when a project is renamed or transferred to another group a system hook message is generated. Currently adds a couple of extra properties to the standard project system hooks messages. old_path_with_namespace - The old path of the project so we can see what has been renamed / transferred changed_at - The time that change took place My main concern is if there is a better way of doing this than passing the extra_data variable into the system hook. Would it be better to extend the project model with these 2 items as transient properties as I doubt they would need to be saved to the database? The other I've also seen, but can't find, someone talking about the emails sent when a project is renamed or transferred doesn't reference the original project path so if you have similarly named projects then you might not know what has been moved. I think the extra_data (or however it is best to implement this) would allow the extra information to be sent in emails. Closes [System hooks for project transfer and repository rename](http://feedback.gitlab.com/forums/176466-general/suggestions/6006233-system-hooks-for-project-transfer-and-repository-r) See merge request !611
| * | | | Added system hooks messages for renaming and transferring a projectSteve Norman2016-01-043-1/+19
| |/ / /
* | | | remove public field from namespace and refactoringnamespace-clean_upValery Sizov2016-01-049-116/+6
|/ / /
* | | catch Emoji encode errorValery Sizov2016-01-041-1/+1
| |/ |/|
* | Merge branch 'rs-delimit-all-the-things' into 'master' Dmitriy Zaporozhets2016-01-0411-36/+36
|\ \ | | | | | | | | | | | | | | | | | | number_with_delimiter most of the things See merge request !2258
| * | number_with_delimiter most of the thingsrs-delimit-all-the-thingsRobert Speicher2015-12-3111-36/+36
| | |
* | | Merge branch 'rs-abuse-report-form' into 'master' Dmitriy Zaporozhets2016-01-041-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add js-requires-input and js-quick-submit to abuse report form See merge request !2245
| * | | Add js-requires-input and js-quick-submit to abuse report formrs-abuse-report-formRobert Speicher2015-12-301-2/+2
| | | |
* | | | Merge branch 'rs-remove-jquery-blockui' into 'master' Dmitriy Zaporozhets2016-01-041-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove jquery.blockUI.js plugin It was required but no longer used. See merge request !2273
| * | | | Remove jquery.blockUI.js pluginRobert Speicher2016-01-011-1/+0
| | |/ / | |/| | | | | | | | | | It was required but never used.
* | | | Merge branch 'rs-remove-jquery-history-js' into 'master' Dmitriy Zaporozhets2016-01-043-5/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove jquery.history.js plugin We're not concerning ourselves with non-HTML5 browser compatibility, and this removes 21 KB from our compiled JavaScript. Bonus fix: There was an extra space after the query string in the URLs that has now been removed. See merge request !2272
| * | | | Remove jquery.history.js pluginrs-remove-jquery-history-jsRobert Speicher2016-01-013-5/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're not concerning ourselves with non-HTML5 browser compatibility, and this removes 21 KB from our compiled JavaScript. Bonus fix: There was an extra space after the query string in the URLs that has now been removed.
* | | | Merge branch 'rs-bump-cal-heatmap' into 'master' Dmitriy Zaporozhets2016-01-043-43/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump cal-heatmap-rails to ~> 3.5.0 See merge request !2276
| * | | | Update cal-heatmap style overridesrs-bump-cal-heatmapRobert Speicher2016-01-011-36/+6
| | | | | | | | | | | | | | | | | | | | Some were no longer needed, others needed `!important`.
| * | | | Reorder JS requiresRobert Speicher2016-01-011-2/+2
| | | | | | | | | | | | | | | | | | | | The old way broke d3, for some reason.
| * | | | Remove unused "options" object from Calendar JSRobert Speicher2016-01-011-5/+0
| | |_|/ | |/| |
* | | | Merge branch 'expire-cache-on-app-settings-change' into 'master' Dmitriy Zaporozhets2016-01-043-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expire view caches when application settings change If the admin disables Gravatar, for example, before the views would not invalidate. Now they invalidate automatically when this happens. Closes #5728 See merge request !2280
| * | | | Expire view caches when application settings changeStan Hu2016-01-033-3/+3
| |/ / / | | | | | | | | | | | | Closes #5728
* | | | Merge branch 'rs-safari-version-check' into 'master' Dmitriy Zaporozhets2016-01-031-5/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't attempt to set Referrer policy in Safari While Safari supports the policy, it does not (currently, as of 9.x) recognize `origin-when-cross-origin` as a valid value, so we omit the policy entirely under Safari. Closes #5609 See merge request !2269
| * | | Don't attempt to set Referrer policy in Safarirs-safari-version-checkRobert Speicher2015-12-311-5/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | While Safari supports the policy, it does not (currently, as of 9.x) recognize `origin-when-cross-origin` as a valid value, so we omit the policy entirely under Safari. Closes #5609
* | | Fix typo in CI settingsSteffen Köhler2016-01-011-1/+1
|/ / | | | | | | [ci skip]
* | Swap Author and Assignee Selectors on issuable index viewZeger-Jan van de Weg2015-12-301-4/+4
|/ | | | Closes #4039
* Merge branch 'fix/missing-ci-build-traces' into 'master' Grzegorz Bizon2015-12-302-9/+57
|\ | | | | | | | | | | | | Hotfix for builds trace data integrity Closes #4246 See merge request !2224
| * Add hotfix that allows to access build artifacts created before 8.3fix/missing-ci-build-tracesGrzegorz Bizon2015-12-292-9/+36
| | | | | | | | | | | | | | | | | | | | | | This is a temporary hotfix that allows to access build artifacts created before 8.3. See #5257. This needs to be changed after migrating CI build files. Note that `ArtifactUploader` uses `artifacts_path` to create a storage directory before and after parsisting `Ci::Build` instance, before and after moving a file to store (save and fetch a file).
| * Hotfix for builds trace data integrityGrzegorz Bizon2015-12-281-1/+22
| | | | | | | | Issue #4246
* | Merge branch 'fix-user-autocomplete' into 'master' Robert Speicher2015-12-301-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes problem with user autocomplete URI ``` Failed to load resource: net::ERR_NAME_NOT_RESOLVED http://autocomplete/users.json?search=&per_page=20&active=true&current_user=false ``` Fixes #4118, #4136 See merge request !2136
| * | Fix user autocomplete uriIgor Matsko2015-12-261-1/+1
| | |
* | | Fix project transfer e-mail sending incorrect paths in e-mail notificationStan Hu2015-12-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The introduction of ActiveJob and `deliver_now` in 7f214cee7 caused a race condition where the mailer would be invoked before the project was committed to the database, causing the transfer e-mail notification to show the old path instead of the new one. Closes #4670
* | | Merge branch 'upvote_count_to_api' into 'master' Valery Sizov2015-12-292-8/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert upvotes and downvotes params back to MR API issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 See merge request !2212
| * | | note votes methids implementationupvote_count_to_apiValery Sizov2015-12-291-2/+2
| | | |
| * | | Revert upvotes and downvotes params to MR APIValery Sizov2015-12-282-6/+2
| | | |
* | | | Merge branch 'influxdb-without-sidekiq' into 'master' Yorick Peterse2015-12-293-38/+7
|\ \ \ \ | | | | | | | | | | See merge request !2238
| * | | | Write to InfluxDB directly via UDPYorick Peterse2015-12-293-38/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for Sidekiq and any overhead/problems introduced by TCP. There are a few things to take into account: 1. When writing data to InfluxDB you may still get an error if the server becomes unavailable during the write. Because of this we're catching all exceptions and just ignore them (for now). 2. Writing via UDP apparently requires the timestamp to be in nanoseconds. Without this data either isn't written properly. 3. Due to the restrictions on UDP buffer sizes we're writing metrics one by one, instead of writing all of them at once.
* | | | | Merge branch 'issue_3780' into 'master' Dmitriy Zaporozhets2015-12-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Downcased user or email search for avatar_icon. GitLab users are defined with their mail address which is enforced to be lower case. When a commit is listed in the history whose committer mail address is not written in all lower case, the corresponding GitLab user won't be found because the search is case sensitive resp. the mail address to search for not downcased. Closes #3780 See merge request !2234
| * | | | Downcased user or email search for avatar_icon.issue_3780Stefan Kahlhöfer2015-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rubén Dávila <rdavila84@gmail.com>
* | | | | Merge branch 'feature/recaptcha_settings' into 'master' Dmitriy Zaporozhets2015-12-296-12/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes reCAPTCHA configurable through Application Settings screen Following the work made by @stanhu here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2216, made it configurable without needing to restart Gitlab See merge request !2231
| * | | | | When reCAPTCHA is disabled, allow registrations to go through without a codefeature/recaptcha_settingsStan Hu2015-12-281-1/+1
| | | | | |
| * | | | | reCAPTCHA is configurable through Admin Settings, no reload needed.Gabriel Mazetto2015-12-286-12/+50
| |/ / / /
* | | | | Merge branch 'fix-spelling-mistake' into 'master' Robert Speicher2015-12-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix spelling mistake, thanks Connor. [ci skip] See merge request !2227
| * | | | Fix spelling mistake, thanks Connor.fix-spelling-mistakeSytse Sijbrandij2015-12-281-1/+1
| | | | |
* | | | | Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settingsYorick Peterse2015-12-282-0/+61
|/ / / /
* | | | Merge branch 'influxdb' into 'master' Dmitriy Zaporozhets2015-12-281-0/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Storing of application metrics in InfluxDB This adds support for tracking metrics in InfluxDB, which in turn can be visualized using Grafana. For more information see #2936. See merge request !2042