summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Chnaged padding of project header navproject-headerPhil Hughes2016-07-051-1/+1
|
* Fixed issue with Forked from text not being visiblePhil Hughes2016-07-041-9/+8
|
* Updated spacingPhil Hughes2016-07-042-7/+8
| | | | CHANGELOG item
* Updated project headerPhil Hughes2016-07-044-92/+85
| | | | Closes #18544
* Merge branch 'explicit-requesters-scope' into 'master' Douwe Maan2016-07-019-34/+30
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude requesters from Project#members, Group#members and User#members ## What does this MR do? It excludes requesters from the `Project#members`, `Group#members` and `User#members` associations, and adds new `Project#requesters` and `Group#requesters` associations. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Without this, if you call `project.members`, requesters are included in the results! This is at best misleading, and at worst can lead to security issues. By excluding requesters from the `#members` associations, we avoid introducing security inadvertently since you have to call the `#requesters` association explicitly to get requesters. ## What are the relevant issue numbers? This is something I realized while fixing the security issue #19102. ## Does this MR meet the acceptance criteria? - [x] I don't think this needs a CHANGELOG since this is an internal change - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4946
| * Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-019-34/+30
| | | | | | | | | | | | And create new Project#requesters, Group#requesters scopes. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Fix import button when import fail due the namespace already been takenDouglas Barbosa Alexandre2016-07-011-1/+4
|/
* Merge branch 'cache-autocomplete-results' into 'master' Jacob Schatz2016-07-011-0/+1
|\ | | | | | | | | | | | | | | | | Cache autocomplete results ## What does this MR do? Caches the results of the autocomplete AJAX call to stop new GFM inputs on the page from requesting new data. The cache is then cleared on each new page so that it doesn't stay around per project. See merge request !5043
| * Cache autocomplete resultscache-autocomplete-resultsPhil Hughes2016-07-011-0/+1
| |
* | Improve the request / withdraw access button18310-improve-request-access-buttonRémy Coutable2016-07-013-9/+6
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-07-0162-195/+286
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable-shared-runners-with-admins * upstream/master: (120 commits) Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9. Remove additional entries from CHANGELOG Catch permission denied errors and ignore the disk Remove coveralls lines Make GH one-off auth the default again for importing GH projects Import from Github using Personal Access Tokens. Remove hardcoded gitlab-shell version in test env now that the required tag is published Updated breakpoint for sidebar pinning Expire branch/tag git data when needed. Remove unnecessary parens Enable Style/UnneededCapitalW Rubocop cop Expiry date on pinned nav cookie Fix broken spec in git_push_service_spec by stubbing an external issue tracker Handle external issues in IssueReferenceFilter Move Changelog entry for build retry fix to 8.9.4 Add Changelog entry for build sidebar retry link fix Improve method that tells if build is retryable Do not show build retry link when build is active Remove coveralls as its unused Move changelot item "Add sub nav to file page view" to 8.9.4 ...
| * Merge branch 'build-reopen-json' into 'master' Gabriel Mazetto2016-06-301-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build path sends JSON file path ## What does this MR do? Fixes an issue with browser caching JSON response on build page. Steps to see: - Open build (https://gitlab.com/gitlab-org/gitlab-ce/builds/2030226) - Close tab - Re-open tab You should now see some JSON :disappointed: This MR appends `.json` to the end of the build URL so that the browser can't cache it as the same URL. See merge request !4935
| | * Build path sends JSON file pathbuild-reopen-jsonPhil Hughes2016-06-281-1/+1
| | |
| * | Make GH one-off auth the default again for importing GH projectsRémy Coutable2016-06-301-15/+21
| | | | | | | | | | | | | | | | | | Advertise the PAT as an alternative unless GH import is not configured. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Import from Github using Personal Access Tokens.Eric K Idema2016-06-303-22/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This stands as an alternative to using OAuth to access a user's Github repositories. This is setup in such a way that it can be used without OAuth configuration. From a UI perspective, the how to import modal has been replaced by a full page, which includes a form for posting a personal access token back to the Import::GithubController. If the user has logged in via GitHub, skip the Personal Access Token and go directly to Github for an access token via OAuth.
| * | Merge branch 'code_style_fixes' into 'master' Robert Speicher2016-06-3041-45/+44
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary parens and other code style fixes This MR is based on reviewers` comments to https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/440 See merge request !5015
| | * | Remove unnecessary parenscode_style_fixesValery Sizov2016-06-3041-45/+44
| | | |
| * | | Merge branch 'issue-18886' into 'master' Dmitriy Zaporozhets2016-06-301-2/+5
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Loop all disks when displaying system info. Closes #18886 See merge request !4983
| | * | Loop all disks when displaying system infoissue-18886Josh Frye2016-06-291-2/+5
| | | |
| * | | Merge branch 'shards' into 'master' Yorick Peterse2016-06-302-1/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Implement multiple repository mount points See merge request !4578
| | * | | Add Application Setting to configure default Repository Path for new projectsshards-configAlejandro Rodríguez2016-06-291-0/+9
| | | | |
| | * | | Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez2016-06-291-1/+1
| | | | |
| * | | | Add sub nav to file viewAnnabel Dunstone2016-06-301-7/+10
| |/ / /
| * | | Merge branch '19157-use-shortcuts-is-not-working-on-gitlab-com-help' into ↵Fatih Acet2016-06-301-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fixed 'use shortcuts' button on docs ## What does this MR do? Exposes 'onToggleHelp() to window object through `showHelp()` so a help panel can be toggled globally using `showHelp()`. ## Are there points in the code the reviewer needs to double check? Is this the best implementation? I actually think this is tidier than doing something like `onclick="new Shortcuts().onToggleHelp"` or `$.trigger 'keydown', char: '?'` but let me know. ## Why was this MR needed? Docs UX ## What are the relevant issue numbers? Closes #19157. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #19157 See merge request !4979
| | * | | Exposed 'onToggleHelp() to window object so showHelp() can be a global function'Luke "Jared" Bennett2016-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | Removed from window and used static method
| * | | | Merge branch 'cache-max-user-access-name' into 'master' Robert Speicher2016-06-291-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memoize the maximum access level for the author of notes Cache the maximum access level for each user in a map in the controller In #19273, we saw that retrieving ProjectTeam#human_max_access for each note takes the bulk of the time when rendering certain issues or merge requests. We observe that most of the comments in an issue are typically done by the same users. This MR memoizes the max access level by user ID. See merge request !4982
| | * | | | Memoize the maximum access level for the author of notesStan Hu2016-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #19273, we saw that retrieving ProjectTeam#human_max_access for each note takes the bulk of the time when rendering certain issues or merge requests. We observe that most of the comments in an issue are typically done by the same users. This MR memoizes the max access level by user ID.
| * | | | | Merge branch 'label-filter-path-fix' into 'master' Jacob Schatz2016-06-291-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed URL on label button when filtering ## What does this MR do? Gives the filtered labels the correct URL. Previously they tried to link to `labels#show` whereas now it links to the correct filter path. ## What are the relevant issue numbers? Closes #19005 See merge request !4897
| | * | | | Fixed URL on label button when filteringlabel-filter-path-fixPhil Hughes2016-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Closes #19005
| * | | | | Merge branch 'issue_3359_3' into 'master' Douwe Maan2016-06-291-2/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Insert notification settings dropdown into groups ## Display notification settings dropdown for groups part of #3359 ![groups](/uploads/d61648236b81b0cca55fa2d73758f0df/groups.png) ![Screenshot_from_2016-06-29_10-58-37](/uploads/7be05ea6002932c094a81b25a308fd62/Screenshot_from_2016-06-29_10-58-37.png) ![small](/uploads/6f2b556d734c870e358f6f56618a0bab/small.png) See merge request !4857
| | * \ \ \ \ Merge branch 'master' into issue_3359_3issue_3359_3Felipe Artur2016-06-2932-273/+262
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | merge master into issue_3359_3Felipe Artur2016-06-291-3/+6
| | |\ \ \ \ \
| | | * | | | | Insert notification settings dropdown into groupsFelipe Artur2016-06-222-1/+4
| | | | | | | |
| | * | | | | | merge master into issue_3359_3Felipe Artur2016-06-22183-1639/+2178
| | |\ \ \ \ \ \
| | * | | | | | | Insert notification settings dropdown into groupsFelipe Artur2016-06-222-1/+3
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Changes calendar activities to use target referencecal-activities-target-referencePhil Hughes2016-06-291-1/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'md-toolbar-multiline-code' into 'master' Jacob Schatz2016-06-291-2/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Markdown toolbar inserts code blocks ## What does this MR do? Adds the ability to insert code blocks with the markdown toolbar buttons. This is done by selecting the block & then clicking the code button. ## What are the relevant issue numbers? Closes #19173 See merge request !4950
| | * | | | | Markdown toolbar inserts code blocksmd-toolbar-multiline-codePhil Hughes2016-06-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #19173
| * | | | | | Change load average to cpu/cores on system info.Josh Frye2016-06-281-2/+2
| | | | | | |
| * | | | | | Use number_to_human_size for system info and remove dependency on Filesize gem.Josh Frye2016-06-282-3/+3
| | | | | | |
| * | | | | | Round figures for system infoJosh Frye2016-06-281-2/+2
| | | | | | |
| * | | | | | Ensure Monitoring tab is highlightedJosh Frye2016-06-281-1/+1
| | | | | | |
| * | | | | | Fix stylingJosh Frye2016-06-282-5/+5
| | | | | | |
| * | | | | | Show basic system info on admin panel. Closes #18886Josh Frye2016-06-282-0/+26
| | | | | | |
| * | | | | | Fix group visibility UI consistency in settingsGrzegorz Bizon2016-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #18949
| * | | | | | Merge branch ↵Jacob Schatz2016-06-281-99/+110
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'lbennett/gitlab-ce-2542-implement-updated-ui-for-new-project-page' into 'master' Implement UI for new project page ## What does this MR do? Updates the project creation page to conform with the latest UI updates. ## Are there points in the code the reviewer needs to double check? Ney. ## Why was this MR needed? Updated UI. ## What are the relevant issue numbers? Closes #2542. ## Screenshots (if relevant) **Desktop:** ![Screen_Shot_2016-06-18_at_04.00.48](/uploads/0313eee96a2aef9ed5e048989548b133/Screen_Shot_2016-06-18_at_04.00.48.png) **Mobile:** ![Screen_Shot_2016-06-18_at_04.01.00](/uploads/505b110c3fcbf523aac08797db9f6781/Screen_Shot_2016-06-18_at_04.01.00.png) See merge request !4766
| | * | | | | | Wiped old page and started on new UIlbennett/gitlab-ce-2542-implement-updated-ui-for-new-project-pageLuke "Jared" Bennett2016-06-281-99/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Completed new project page Updated CHANGELOG Corrected 'Create project' button Made responsive Added gitlab export button Changed Spinach test to match updated UI reverted test changes and fixed UI Corrected 'Repo by URL' text Fixed static namespace style Added errors partial Added padding to bottom of page-with-sidebar
| * | | | | | | Switched mobile button icons to ellipsis and angleAnnabel Dunstone2016-06-286-11/+11
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'display-deleted-ref-in-events' into 'master' Rémy Coutable2016-06-281-8/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display last commit of deleted branch in push events ## What does this MR do? Display the last commit of a deleted branch in the push events of a project. ## Are there points in the code the reviewer needs to double check? Is the change in `app/models/event.rb` the correct way to display a two-line event for deleted branches? ## Why was this MR needed? It is easier to restore an accidentally deleted branch if the commit hash is displayed in the push events. ## What are the relevant issue numbers? Fixes #18659 ## Screenshots ### Before garbage collection ![before-gc](/uploads/5674cd53e1564d48b7f2f8406ea0fbed/before-gc.png) ### After garbage collection ![after-gc](/uploads/80950c1932feeb3b69d0fc11b8f7acf4/after-gc.png) See merge request !4699
| | * | | | | | Display last commit of deleted branch in push events (!4699)winniehell2016-06-281-8/+17
| | | |_|_|_|/ | | |/| | | |
View Lorry Controller Status