summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '36582-fix-note-resolved-icon' into 'master'evn-fix-formatting-of-claFatih Acet2017-08-283-3/+8
|\ | | | | | | | | | | | | Update and fix resolvable note icons for easier recognition Closes #36582 See merge request !13821
| * Update and fix resolvable note icons for easier recognition36582-fix-note-resolved-iconEric Eastwood2017-08-253-3/+8
| |
* | Merge branch 'group-mr-search-bar' into 'master'Clement Ho2017-08-281-1/+5
|\ \ | | | | | | | | | | | | | | | | | | Add filtered search to group merge requests dashboard Closes #36703 See merge request !13688
| * | Add filtered search to group merge requests dashboardHiroyuki Sato2017-08-191-1/+5
| | |
* | | Merge branch '35721-auth-style-confirmation' into 'master'Clement Ho2017-08-251-37/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Authorizations regarding OAuth - style confirmation Closes #35721 See merge request !13691
| * | | Authorizations regarding OAuth - style confirmationJacopo2017-08-241-37/+41
| | | | | | | | | | | | | | | | | | | | Changed the styling of OAuth authorization page in order to follow the styling structure described in #28849.
* | | | Merge branch '31409-fix-group-and-project-search-for-anonymous-users' into ↵Kamil Trzciński2017-08-251-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix group and project search for anonymous users Closes #31409 See merge request !13745
| * | | | Fix group and project search for anonymous usersNick Thomas2017-08-241-1/+1
| | | | |
* | | | | Add support for copying permalink to notes via more actions dropdownDimitrie Hoekstra2017-08-251-0/+2
| | | | |
* | | | | Merge branch '36860-deleted-user-fix' into 'master'Sean McGivern2017-08-253-12/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix failure when issue author is nil See merge request !13807
| * | | | | Fix failure when issue author is nilJarka Kadlecova2017-08-253-12/+16
| | | | | |
* | | | | | Merge branch 'zj-reword-job-to-pipeline-chart-view' into 'master'Douwe Maan2017-08-251-3/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reword job to pipeline on the chart view Closes #36928 See merge request !13786
| * | | | | Reword job to pipeline on the chart viewZeger-Jan van de Weg2017-08-241-3/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | This got changed for i18n in !12480, however, I forgot to understand that the meaning of the graphs changed in !12378. This corrects the behaviour.
* | | | | Merge branch '36589-hide-group-name-on-collapse' into 'master'Clement Ho2017-08-244-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide group title on sidebar collapse; use more generic class for titles Closes #36589 See merge request !13777
| * | | | | Hide group title on sidebar collapse; use more generic class for titles36589-hide-group-name-on-collapseAnnabel Dunstone Gray2017-08-234-4/+4
| | | | | |
* | | | | | Changed all font-weight values to 400 and 600Dimitrie Hoekstra2017-08-242-3/+3
| | | | | |
* | | | | | Merge branch ↵Kamil Trzciński2017-08-241-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/36731-improve-spec-spec-features-runners_spec-rb-and-spec-features-admin-admin_runners_spec-rb' into 'master' Reorganizes spec: spec/features/runners_spec.rb Closes #36731 See merge request !13716
| * | | | | Refurbish spec/features/runners_spec.rbShinya Maeda2017-08-231-1/+1
| | | | | |
* | | | | | Merge branch 'archived-projects-only' into 'master'Douwe Maan2017-08-241-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to list only archived projects Closes #35994 See merge request !13492
| * | | | | | Add an option to list only archived projectsMehdi Lahmam2017-08-241-1/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Closes #35994
* | | | | | Merge branch '36709-gpg-status' into 'master'Clement Ho2017-08-231-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of gpg status Closes #36709 See merge request !13772
| * | | | | Fix alignment of gpg status36709-gpg-statusAnnabel Dunstone Gray2017-08-231-3/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'zj-fix-fe-blank-button' into 'master'Clement Ho2017-08-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix blank button not resetting project template value Closes #36816 See merge request !13757
| * | | | | Fix blank button not resetting project template valueZeger-Jan van de Weg2017-08-231-1/+1
| | |/ / / | |/| | | | | | | | | | | | | The button didn't override a value, so the old value was posted again.
* | | | | Merge branch 'cache-issue-and-mr-counts' into 'master'Douwe Maan2017-08-232-4/+8
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Cache the number of open issues and merge requests Closes #36622 See merge request !13639
| * | | | Cache the number of open issues and merge requestsYorick Peterse2017-08-232-4/+8
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every project page displays a navigation menu that in turn displays the number of open issues and merge requests. This means that for every project page we run two COUNT(*) queries, each taking up roughly 30 milliseconds on GitLab.com. By caching these numbers and refreshing them whenever necessary we can reduce loading times of all these pages by up to roughly 60 milliseconds. The number of open issues does not include confidential issues. This is a trade-off to keep the code simple and to ensure refreshing the data only needs 2 COUNT(*) queries instead of 3. A downside is that if a project only has 5 confidential issues the counter will be set to 0. Because we now have 3 similar counting service classes the code previously used in Projects::ForksCountService has mostly been moved to Projects::CountService, which in turn is reused by the various service classes. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36622
* | | | Merge branch 'remove-tooltip-filtered-search-user' into 'master'Tim Zallmann2017-08-231-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove tooltip from filtered search user Closes #36696 See merge request !13752
| * | | | Remove tooltip from filtered search userremove-tooltip-filtered-search-userClement Ho2017-08-221-1/+1
| | | | |
* | | | | Merge branch 'fix-push-events-branch-removals' into 'master'Sean McGivern2017-08-232-10/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix displaying events of removed events and events without commit messages Closes #36685 and #36722 See merge request !13721
| * | | | | Fix display of push events for removed refsfix-push-events-branch-removalsYorick Peterse2017-08-222-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the style of push events that remove tags or branches so they don't display the commit details. This prevents displaying commit details such as: 000000 . --broken encoding Instead we now simply display the header such as: Administrator deleted branch example-branch This is displayed in the same style as events for newly created branches/tags. This commit also ensures that if no commit message is present we simply don't display anything, instead of "--broken encoding". Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36685 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36722
* | | | | | Merge branch 'rs-fix-admin-logs-timeout' into 'master'Douwe Maan2017-08-231-10/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Fix a potential timeout in `Gitlab::Logger.read_latest` See merge request !13751
| * | | | | Refactor `Admin::LogsController#show`rs-fix-admin-logs-timeoutRobert Speicher2017-08-221-10/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | We should be defining the list of loggers in the controller, not the view.
* | | | | Implement new system note iconsBryce Johnson2017-08-2316-18/+29
|/ / / /
* | | | Merge branch '36721-rename-repo-text' into 'master'Annabel Dunstone Gray2017-08-221-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36721 Remove incorrect paragraph regarding renaming repos in settings Closes #36721 See merge request !13718
| * | | | 36721 Remove incorrect paragraph regarding renaming repos in settings36721-rename-repo-texttauriedavis2017-08-211-2/+0
| | | | |
* | | | | Merge branch 'zj-fix-import-gitlab-export-form' into 'master'Douwe Maan2017-08-221-2/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Update form to properly set the path Closes #36519 See merge request !13722
| * | | | Update form to properly set the pathZeger-Jan van de Weg2017-08-221-2/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also includes a change in allowing uploaded files, as there was a mismatch in object_id between classes, disallowing params[:file], which is a UploadedFile, newly loaded. The params checked against the older version. Fixes gitlab-org/gitlab-ce#36519
* | | | Merge branch '35845-improve-subgroup-creation-permissions' into 'master'Douwe Maan2017-08-221-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves subgroup creation permissions Closes #35845 See merge request !13418
| * | | | Improves subgroup creation permissions35845-improve-subgroup-creation-permissionsTiago Botelho2017-08-211-3/+2
| | | | |
* | | | | Removed some useless code, codestyle changes and removed an indexGabriel Mazetto2017-08-221-1/+1
| | | | |
* | | | | Enable automatic hashed storage for new projects by application settingsGabriel Mazetto2017-08-221-0/+11
| | | | |
* | | | | Use non-i18n values for setting new group-level issue/MR button textBryce Johnson2017-08-218-13/+13
| | | | |
* | | | | Only require sidekiq-limit_fetch when enabled in settingsonly-limit-fetch-when-requestedSean McGivern2017-08-211-1/+3
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gem allows Sidekiq jobs to be throttled. Unfortunately, it has a side-effect: when we haven't enabled job throttling, it will still hit Redis a lot (and miss, because nothing is configured). As this setting already required a restart, ensure that the library is only required when it's enabled.
* | | | Merge branch 'docs/gpg-refactor' into 'master'Marcia Ramos2017-08-212-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Refactor GPG docs See merge request !13660
| * | | Change GPG docs locationAchilleas Pipinellis2017-08-182-2/+2
| | | |
* | | | Make issuable filter dropdown style consistentWinnie Hellmann2017-08-181-3/+3
| | | |
* | | | Add current locale to commit partial cache keyDouwe Maan2017-08-181-1/+1
| |_|/ |/| |
* | | Add support for i18n on Project Activity PageKushal Pandya2017-08-184-12/+12
| | |
* | | Merge branch 'winh-admin-user-actions-dropdown' into 'master'Clement Ho2017-08-171-1/+2
|\ \ \ | | | | | | | | | | | | | | | | Make admin user actions dropdown consistent See merge request !13630
| * | | Make admin user actions dropdown consistentwinh-admin-user-actions-dropdownwinh2017-08-171-1/+2
| | | |