summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Show that user is already blocked on Abuse Reportsfix-block-button-still-showing-on-abuse-reports-after-user-is-blockedKelvin2016-01-061-0/+3
|
* Remove block button on abuse reports if user is already blockedKelvin2016-01-061-1/+1
|
* Fix the abuse report detail URL in the HTML email templaters-fix-abuse-report-urlRobert Speicher2016-01-051-1/+1
|
* Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' Douwe Maan2016-01-051-0/+15
|\ | | | | | | | | | | | | Add graphs of commits ahead/behind default branch (by @brunsa2) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716 See merge request !2301
| * Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-12-03135-754/+867
| |\
| * \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-1299-420/+956
| |\ \
| * | | Refactor for style issuesJeff Stubler2015-11-111-5/+6
| | | |
| * | | Add graphs showing commits ahead and behind default to branches pageJeff Stubler2015-11-011-0/+14
| | | |
* | | | Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master' Douwe Maan2016-01-052-4/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show 'New Merge Request' buttons on canonical repo. (by @joshfng) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2189 to run tests on our runners. See merge request !2300
| * | | | Change text back. Add additional tests.joshfng/gitlab-ce-fix-3802Josh Frye2016-01-031-1/+1
| | | | |
| * | | | Fix testsJosh Frye2016-01-032-2/+2
| | | | |
| * | | | Show 'New Merge Request' buttons on canonical repo.Josh Frye2016-01-032-5/+7
| | | | |
* | | | | Merge branch 'improved-leave-project' into 'master' Dmitriy Zaporozhets2016-01-052-16/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds settings menu to the top for editting and leaving projects @creamzy @skyruler @dzaporozhets Menu contents depends on user's rights. Fixes #4221 ![Screen_Shot_2015-12-23_at_10.02.47_PM](/uploads/daeaef937bf9d9f4db7ccb674e344ac1/Screen_Shot_2015-12-23_at_10.02.47_PM.png) ![Screen_Shot_2015-12-23_at_10.02.41_PM](/uploads/58eb4eea7d640f01d7f05c2a408a2c04/Screen_Shot_2015-12-23_at_10.02.41_PM.png) ![Screen_Shot_2015-12-23_at_10.02.55_PM](/uploads/4b2ae027a13efcbad3eb81b04f134c4f/Screen_Shot_2015-12-23_at_10.02.55_PM.png) ![Screen_Shot_2015-12-23_at_10.04.47_PM](/uploads/bd5d9d8ddd72d16d74c32c6c1f569776/Screen_Shot_2015-12-23_at_10.04.47_PM.png) See merge request !2195
| * | | | | removes footer message about access to projectJacob Schatz2016-01-041-8/+1
| | | | | |
| * | | | | Merge branch 'master' into improved-leave-projectJacob Schatz2015-12-281-0/+53
| |\ \ \ \ \
| * | | | | | fixes tests failingJacob Schatz2015-12-281-2/+2
| | | | | | |
| * | | | | | adds settings menu to the top for editting and leaving projectsJacob Schatz2015-12-282-9/+18
| | | | | | |
* | | | | | | Merge branch 'rs-logo-animation' into 'master' Dmitriy Zaporozhets2016-01-051-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the logo as a loading indicator ![logo-sweep](/uploads/ff048fd2e56a6dcae8801f998b484623/logo-sweep.gif) See merge request !2277
| * | | | | | | Correct the logo ID namesRobert Speicher2016-01-041-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Her left, not ours!
| * | | | | | | Give the logo shapes meaningful IDsRobert Speicher2016-01-021-7/+7
| | | | | | | |
* | | | | | | | Redesign the AbuseReports indexrs-abuse-reportsRobert Speicher2016-01-042-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Shows when the reported user joined - Show relative timestamp for when the report was created - Parse message with restricted Markdown pipeline to autolink URLs
* | | | | | | | Merge branch 'show-all-builds-by-default' into 'master' Robert Speicher2016-01-042-11/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-042-11/+11
| | | | | | | | |
* | | | | | | | | remove public field from namespace and refactoringnamespace-clean_upValery Sizov2016-01-042-11/+2
|/ / / / / / / /
* | | | | | | | 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 '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
* | | | | | Write to InfluxDB directly via UDPYorick Peterse2015-12-291-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'feature/recaptcha_settings' into 'master' Dmitriy Zaporozhets2015-12-292-1/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | reCAPTCHA is configurable through Admin Settings, no reload needed.Gabriel Mazetto2015-12-282-1/+23
| | |/ / / / | |/| | | |
* | | | | | 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-281-0/+53
|/ / / /
* | | | Merge branch 'rs-fix-shortcut-help' into 'master' Dmitriy Zaporozhets2015-12-281-8/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the "Show all" link for the keyboard shortcut modal 18cb430f7983ea557cf2308f5ea7c0af8b79a7b5 introduced a typo that made this stop working. See merge request !2218
| * | | | Fix the "Show all" link for the keyboard shortcut modalrs-fix-shortcut-helpRobert Speicher2015-12-271-8/+0
| | | | |
* | | | | Make sign-up form retain fields after failed CAPTCHA testStan Hu2015-12-271-4/+5
| | | | |
* | | | | Add support for Google reCAPTCHA in user registration to prevent spammersStan Hu2015-12-271-0/+3
|/ / / /
* | | | Merge branch 'close-open-ajax-issue' into 'master' Robert Speicher2015-12-251-9/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | open and close issue via ajax request. With tests Close and Reopen issues with ajax request. See merge request !2164
| * \ \ \ resolves conflicts with new buttonsJacob Schatz2015-12-2323-123/+148
| |\ \ \ \
| * | | | | changes `data-url` to `href` for javascript url grabbingJacob Schatz2015-12-211-2/+2
| | | | | |
| * | | | | open and close issue via ajax request. With testsJacob Schatz2015-12-211-9/+4
| | | | | |
* | | | | | Merge branch 'revert_votes_back' into 'master' Dmitriy Zaporozhets2015-12-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert vote buttons back to issue and MR pages https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 /cc @dzaporozhets @JobV ![joxi_screenshot_1450809309400](/uploads/379a75505e0d5f24e743aa0a6a6684e2/joxi_screenshot_1450809309400.png) See merge request !2206
| * | | | | | add sorting of awardsValery Sizov2015-12-251-1/+1
| | | | | | |