summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'search-commit-ui-fix' into 'master' Jacob Schatz2016-09-162-8/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed commit search UI ## What does this MR do? Fixes the UI for commits in search. If the scope of the search is commits then it renders the list in a `ul` to match the same styling as that on the commits UI. ## Screenshots (if relevant) ![Screen_Shot_2016-09-05_at_15.30.12](/uploads/f567a224be44d5a9b015ac5d1c399bd7/Screen_Shot_2016-09-05_at_15.30.12.png) ## What are the relevant issue numbers? Closes #21868 See merge request !6205
| * Fixed commit search UIsearch-commit-ui-fixPhil Hughes2016-09-052-8/+11
| | | | | | | | Closes #21868
* | Replace contributions calendar timezone payload with datesClement Ho2016-09-161-2/+2
| |
* | fixed incorrect reference to @repository.root_ref in _readme.html.haml. #22083Jason Aquino2016-09-161-1/+1
| |
* | Merge branch 'issue_21824' into 'master' Fatih Acet2016-09-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix issuable templates dropdown for forked projects fixes #21824 See merge request !6329
| * | Fix issuable templates dropdown for forked projectsissue_21824Felipe Artur2016-09-151-1/+1
| | |
* | | Merge branch 'group-specific-lfs-settings' into 'master' Rémy Coutable2016-09-166-10/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added group-specific setting for LFS. Groups can enable/disable LFS, but this setting can be overridden at the project level. **Admin only** Closes #18092 See merge request !6164
| * | | Syntax fixes and better tests for helper methods. Updated docs.group-specific-lfs-settingsPatricio Cano2016-09-153-2/+2
| | | |
| * | | Improved helper methods, better flow for `project.lfs_enabled?`, and UI fixes.Patricio Cano2016-09-153-12/+10
| | | |
| * | | Added group-specific setting for LFS.Patricio Cano2016-09-156-2/+24
| |/ / | | | | | | | | | Groups can enable/disable LFS, but this setting can be overridden at the project level. Admin only
* | | Merge branch 'fix-typos' into 'master' Rémy Coutable2016-09-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix spelling: sucessfully -> successfully Originally from gitlab-org/gitlab-ee!682 See merge request !6376
| * | | Fix spelling: sucessfully -> successfullyStan Hu2016-09-151-1/+1
| | | | | | | | | | | | | | | | Originally from gitlab-org/gitlab-ee!682
* | | | Merge branch '20870-secret-variables-sorted-by-key' into 'master' Rémy Coutable2016-09-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort secret keys by key instead of id. Closes #20870 See merge request !6275
| * | | | Sort secret variables by key (fix #20870)Diego Souza2016-09-091-1/+1
| | | | |
* | | | | Remove empty stage state; fit tooltip on one lineAnnabel Dunstone Gray2016-09-163-19/+2
| | | | |
* | | | | Remove stage names; connect stages in columnAnnabel Dunstone Gray2016-09-163-15/+24
| | | | |
* | | | | Merge branch 'issue-boards-keyboard-shortcut' into 'master' Jacob Schatz2016-09-152-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added keyboard shortcut to navigate to issue boards ## What does this MR do? Adds a keyboard shortcut of `g l` to navigate to issue boards. `g b` would work nicer. However that is taken by builds. Open to suggestions. ## What are the relevant issue numbers? Closes #21218 See merge request !6248
| * | | | | Added keyboard shortcut to navigate to issue boardsPhil Hughes2016-09-152-0/+10
| | |_|/ / | |/| | | | | | | | | | | | | Closes #21218
* | | | | Merge branch '18849-project-snippets-page-isn-t-really-responsive' into ↵Jacob Schatz2016-09-158-46/+55
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update snippets UI ## What does this MR do? Updates snippets UI _(mainly mobile view)_ to new UI proposed in #18849. ## Are there points in the code the reviewer needs to double check? Does anyone know the implementation difference between `app/views/snippets/show.html.haml` and `app/views/projects/snippets/show.html.haml`? I have only been updating the latter as it's the only one I can find implemented. I assume the former is rendered somewhere seeing as there is controllers for it too. But this doesn't seem very DRY from my current perspective. ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-09-06_at_14.20.10](/uploads/ac124a3b0896872ce851b9f56fbe339c/Screen_Shot_2016-09-06_at_14.20.10.png) ![Screen_Shot_2016-09-06_at_14.20.32](/uploads/8d3c7b1d1a5f562ceb6dc22bde695289/Screen_Shot_2016-09-06_at_14.20.32.png) ![Screen_Shot_2016-09-06_at_14.20.48](/uploads/6b1c31ece6d2400bbfc3c673d9e82d4b/Screen_Shot_2016-09-06_at_14.20.48.png) ## 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #18849 See merge request !6210
| * | | | Reordered dropdown options18849-project-snippets-page-isn-t-really-responsiveLuke Bennett2016-09-078-46/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearranged datetime created line Added `avatar_class` option to `link_to_member` so it can be hidden Made snippet title font heavier Added file title bar Hidden unneeded info from xs screens Added visibility icon Reveal file-actions on xs screens Added comments icon to snippets list items Refactored no-comments declaration into framework stylesheet Final touch ups Fixed snippets_spec
* | | | | Merge branch 'group-similar' into 'master' Rémy Coutable2016-09-155-26/+44
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group similar builds We group builds by removing from the builds name two numbers which are delimited by whitespace or colon: * `name 0 1` => `name` * `name 0:1` => `name` * `name 0/1` => `name` * `name 0:1 ruby` => `name ruby` * `name 0/1 ruby` => `name ruby` * `0 1 name ruby` => `name ruby` * `0:1 name ruby` => `name ruby` * `0/1 name ruby` => `name ruby` See merge request !6242
| * | | | Fix spec failuresgroup-similarKamil Trzcinski2016-09-144-6/+4
| | | | |
| * | | | Re-use as much of views as possibleKamil Trzcinski2016-09-146-58/+46
| | | | |
| * | | | Style grouped builds dropdownAnnabel Dunstone Gray2016-09-072-9/+24
| | | | |
| * | | | Group similar buildsKamil Trzcinski2016-09-072-2/+19
| | | | |
* | | | | Backport search_helper changes from EEbackport_to_search_helper_from_eeValery Sizov2016-09-142-2/+2
| | | | |
* | | | | Restore SSH Key title auto-population behaviorRobert Speicher2016-09-131-0/+1
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21823
* | | | | Change method name to #reopenable?Katarzyna Kobierska2016-09-131-1/+1
| | | | |
* | | | | Add #can_reopen? and testsKatarzyna Kobierska2016-09-131-1/+1
| | | | |
* | | | | Add #closed_without_source_project?Katarzyna Kobierska2016-09-132-15/+18
| | | | |
* | | | | Merge branch '21877-no-mr-branch-title-link-in-issue-on-mobile' into 'master' Annabel Dunstone Gray2016-09-132-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue merge-request-info missing on mobile ## What does this MR do? Removed media query declaration relating to `.merge-request-info` and `.issue-info`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Mobile UX ## Screenshots (if relevant) ![Screen_Shot_2016-09-07_at_19.10.39](/uploads/6dc39b72459087826071ba9fbd06da17/Screen_Shot_2016-09-07_at_19.10.39.png) ## 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21877 See merge request !6250
| * | | | | Used flexbox to force related merge request list items into columned items21877-no-mr-branch-title-link-in-issue-on-mobileLuke Bennett2016-09-092-2/+2
| |/ / / /
* | | | | Remove unnecessary variablesKatarzyna Kobierska2016-09-132-8/+8
| | | | |
* | | | | Code refactoringKatarzyna Kobierska2016-09-133-11/+14
| | | | |
* | | | | Improve build_path name and admin variableKatarzyna Kobierska2016-09-135-14/+13
| | | | |
* | | | | Fix error in pathsKatarzyna Kobierska2016-09-131-6/+5
| | | | |
* | | | | Build path with callKatarzyna Kobierska2016-09-134-30/+6
| | | | |
* | | | | Create shared partial for project and admin buildsKatarzyna Kobierska2016-09-136-93/+46
| | | | |
* | | | | Moved build tabs partial to sharedKatarzyna Kobierska2016-09-133-2/+2
| | | | |
* | | | | Improve table code and add CHANGELOGKatarzyna Kobierska2016-09-131-4/+2
| | | | |
* | | | | Improve code in table partialKatarzyna Kobierska2016-09-131-3/+4
| | | | |
* | | | | Improve codeKatarzyna Kobierska2016-09-135-10/+11
| | | | |
* | | | | Liken admin and project builds views to each otherKatarzyna Kobierska2016-09-133-43/+31
| | | | |
* | | | | Move builds content list to partialKatarzyna Kobierska2016-09-133-40/+45
| | | | |
* | | | | Use local variables in partialKatarzyna Kobierska2016-09-133-10/+10
| | | | |
* | | | | Change the way paths are generatedKatarzyna Kobierska2016-09-133-11/+9
| | | | |
* | | | | Add partial to admin builds and project buildsKatarzyna Kobierska2016-09-133-44/+30
| | | | |
* | | | | Only check :can_resolve permission if the note is resolvablesh-defer-resolvable-checkStan Hu2016-09-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Currently this permission check incurs a significant performance hit on loading issues where it does not make sense to check this permission in the first place.
* | | | | Merge branch 'add-remember-option-u2f' into 'master' Robert Speicher2016-09-092-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the remember_me option into the u2f form and support it while authenticating ## What does this MR do? Adds remember me support in the u2f authentication, and makes sure the flag gets passed from the login form to the u2f form. Based on the changes for the same thing done for regular 2fa: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4369 ## Why was this MR needed? The remember me option wasn't working for u2f devices (yubikey) ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18103 See merge request !5918
| * | | | | Pass the remember_me option into the u2f form and support it while ↵add-remember-option-u2fDJ Mountney2016-09-012-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authenticating Matches the changes done for non-u2f two-factor auth
View Lorry Controller Status