summaryrefslogtreecommitdiff
path: root/app/views/layouts
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '27934-left-align-nav' into 'master' Alfredo Sumaran2017-02-202-3/+3
|\ | | | | | | | | | | | | Resolve "Left align nav items" Closes #27934 See merge request !9338
| * Move tanuki to left of title; increase max-width of titleAnnabel Dunstone Gray2017-02-171-2/+2
| |
| * Refactor project stats & last_commit CSS; left align main nav itemsAnnabel Dunstone Gray2017-02-171-1/+1
| |
* | Remove badge styling in dropdown; remove blue outlineAnnabel Dunstone Gray2017-02-171-2/+2
|/
* Merge branch '26200-convert-sidebar-to-dropdown' into 'master'Sean McGivern2017-02-175-63/+49
|\ | | | | | | | | | | | | Resolve "Update global sidebar to dropdown" Closes #26200 See merge request !9199
| * Cache js selectors; fix css26200-convert-sidebar-to-dropdownAnnabel Dunstone Gray2017-02-161-1/+1
| |
| * Make active links bold; fix badge stylingAnnabel Dunstone Gray2017-02-151-6/+5
| |
| * Fix dropdown alignmentAnnabel Dunstone Gray2017-02-151-6/+5
| |
| * Remove sidebar toggle button; replace with dropdownAnnabel Dunstone Gray2017-02-151-15/+10
| |
| * Remove all gitlab theme related codeAnnabel Dunstone Gray2017-02-153-3/+3
| |
| * Remove pinned nav functionality and side_navbar_classAnnabel Dunstone Gray2017-02-151-18/+1
| |
| * Add dropdown toggle buttonAnnabel Dunstone Gray2017-02-152-39/+49
| |
* | override favicon for development to find tabs more easilySimon Knox2017-02-161-1/+1
|/
* Remove fixed positioning from navbarAnnabel Dunstone Gray2017-02-101-1/+1
|
* Changed the controller/route name to 'ci/cd' and renamed the corresponding filesJose Ivan Vargas2017-02-061-2/+2
| | | | Added tests to verify the access policy to the new controller
* Removed options from the gear button in the projects and consolidated into oneJose Ivan Vargas2017-02-061-14/+2
| | | | Added test for the CiCdPipelinesController
* Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-063-5/+4
|\ | | | | | | # Conflicts: # db/schema.rb
| * Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-034-6/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (181 commits) Fixed adding to list bug Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Fixed modal lists dropdown not updating when list is deleted Fixed remove btn error after creating new issue in list Removed duplicated test Removed Masonry, instead uses groups of data Uses mixins for repeated functions Fixed up specs Props use objects with required & type values Removes labels instead of closing issue when clicking remove button Fixed JS lint errors Fixed issue card spec Added webkit CSS properties Fixed bug with empty state showing after search Fixed users href path being incorrect Fixed bug where 2 un-selected issues would stay on selected tab Fixed DB schema Changed how components are added in objects Added remove button Add optional id property to the issue schema Fixed issue link href Disabled add issues button if no lists exist ...
| | * Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master' Jacob Schatz2017-02-033-4/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Remove Turbolinks Closes #25624 See merge request !8570
| | | * Rename scripts_body_top to project_javascripts.Bryce Johnson2017-02-022-2/+2
| | | |
| | | * Remove turbolinks.Bryce Johnson2017-02-022-3/+2
| | | |
| * | | Merge branch 'master' into webpackMike Greiling2017-02-021-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (63 commits) Use `add_$role` helper in snippets specs removes old css class from everywhere Fixes broken build: Use jquery to get the element position in the page Check public snippets for spam Keep snippet visibility on error Update pipeline and commit URL and text on CI status change Support non-ASCII characters in GFM autocomplete Active tense test coverage Fix filtered search manager spec teaspoon error Reduce the number of loops that Cycle Analytics specs use Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion. update spec Change the reply shortcut to focus the field even without a selection. use destroy_all Remove settings cog from within admin scroll tabs; keep links centered add changelog remove old project members from project add spec replicating validation error Improve styling of the new issue message Don't capitalize environment name in show page ...
| * | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-271-7/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (389 commits) Document "No gems fetched from git repositories" policy [ci skip] Typos Small gramatical tweaks Typos Added PHP & NPM doc Use `:empty_project` where possible in request specs Add caching of droplab ajax requests Use `:empty_project` where possible in model specs Revert 3f17f29a Remove unused js response from refs controller Add MR id to changelog entry fixed small mini pipeline graph line glitch Prevent form to be submitted twice Fix Error 500 when repositories contain annotated tags pointing to blobs Fix /explore sorting (trending) Simplify wording in "adding an image" docs Remove "official merge window" from CONTRIBUTING.md [ci skip] Update repository check documentation Fixed flexbox and wrap issues Update two_factor_authentication.md ...
| * \ \ \ Merge branch 'master' into go-go-gadget-webpackPhil Hughes2017-01-131-7/+2
| |\ \ \ \
| * | | | | fix rubocop complaint about ambiguous splat operatorMike Greiling2017-01-101-1/+1
| | | | | |
| * | | | | replace application.js sprockets output with webpack-generated equivalentMike Greiling2017-01-061-2/+1
| | | | | |
| * | | | | add webpack, webpack-rails, and webpack-dev-server along with a simple hello ↵Mike Greiling2017-01-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | world test Add the following line to GDK Procfile to play with it: webpack: exec support/exec-cd gitlab npm run dev-server
* | | | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-031-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Fix broken tests17662-rename-buildsFilipa Lacerda2017-02-031-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Build to Job Replace "Builds" by "Jobs" and fix broken specs Replace "Builds" by "Jobs" Fix broken spinach test Fix broken test Remove `˙` at the beginning of the file Fix broken spinach test Fix broken tests Changes after review
* | | | | Initial work on GitLab Pages updateKamil Trzcinski2017-01-311-0/+4
|/ / / /
* | | | Remove settings cog from within admin scroll tabs; keep links centered19164-mobile-settingsAnnabel Dunstone Gray2017-01-311-1/+1
| |_|/ |/| |
* | | Corrected code style and titlesJose Ivan Vargas2017-01-181-1/+1
| | |
* | | Moved the webhooks and services gear options to a single one called integrationsJose Ivan Vargas2017-01-181-7/+3
| |/ |/|
* | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran2017-01-061-7/+2
|\ \ | |/ |/| | | | | | | | | Moved the members and groups to single option called members Closes #25985 See merge request !8281
| * Removed the "Groups" option from the settings gearJose Ivan Vargas2017-01-031-5/+0
| | | | | | | | Fixed more tests
| * Moved the members (project_members)option to a single controller called membersJose Ivan Vargas2017-01-031-2/+2
| | | | | | | | | | | | | | This controller is going to contain both the project members and groups options for the settings gear. Generated the route and modified the routing to point to the new members setting path
* | Merge branch '26352-user-dropdown-settings' into 'master' Annabel Dunstone Gray2017-01-052-3/+3
|\ \ | | | | | | | | | | | | | | | | | | 26352 Change Profile settings to User / Settings Closes #26352 See merge request !8453
| * | 26352 Change Profile settings to User / Settings26352-user-dropdown-settingstauriedavis2017-01-042-3/+3
| |/
* | 25701 standardize text colors25701-standardize-text-colorstauriedavis2017-01-043-5/+5
|/
* HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-3112-35/+35
|
* HAMLLint: Fix `ImplicitDiv` offencesKushal Pandya2016-12-312-3/+3
|
* HAMLLint: Fix `HtmlAttributes` offencesKushal Pandya2016-12-311-1/+1
|
* HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya2016-12-312-3/+3
|
* About GitLab link in sidebar that links to help pageview-ce-vs-eevictorwu2016-12-281-0/+4
|
* Merge branch 'master' into 'badge-color-on-white-bg'Dimitrie Hoekstra2016-12-212-6/+15
|\ | | | | | | # Conflicts: # app/assets/stylesheets/pages/pipelines.scss
| * Merge branch '25743-clean-up-css-for-project-alerts-and-flash-notifications' ↵25428-sort-order-for-pipeline-build-lists-doesn-t-properly-handle-numbersAnnabel Dunstone Gray2016-12-161-3/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Clean up CSS for project alerts and flash notifications." ## What does this MR do? Cleans up CSS and html for alert stripes at the top of project pages. ## Screenshots #### Before: ![Screen_Shot_2016-12-16_at_2.39.01_PM_copy](/uploads/6a700cf1e41557c00cdaef40f6a2a5b2/Screen_Shot_2016-12-16_at_2.39.01_PM_copy.png) #### After: ![Screen_Shot_2016-12-16_at_2.39.23_PM_copy](/uploads/c849578becc3a634e8b15ab5340d86a2/Screen_Shot_2016-12-16_at_2.39.23_PM_copy.png) ## Are there points in the code the reviewer needs to double check? In order to get multiple alerts to appear manually while testing, I simply added the following block to [app/views/shared/_no_password.html.haml](app/views/shared/_no_password.html.haml): ``` .no-password-message.alert.alert-warning.hidden-xs You won't be able to pull or push project code via #{gitlab_config.protocol.upcase} until you #{link_to 'set a password', edit_profile_password_path} on your account .pull-right = link_to "Don't show again", profile_path(user: {hide_no_password: true}), method: :put | = link_to 'Remind later', '#', class: 'hide-no-password-message' .no-password-message.alert.alert-warning.hidden-xs You won't be able to pull or push project code via #{gitlab_config.protocol.upcase} until you #{link_to 'set a password', edit_profile_password_path} on your account .pull-right = link_to "Don't show again", profile_path(user: {hide_no_password: true}), method: :put | = link_to 'Remind later', '#', class: 'hide-no-password-message' .no-password-message.alert.alert-warning.hidden-xs You won't be able to pull or push project code via #{gitlab_config.protocol.upcase} until you #{link_to 'set a password', edit_profile_password_path} on your account .pull-right = link_to "Don't show again", profile_path(user: {hide_no_password: true}), method: :put | = link_to 'Remind later', '#', class: 'hide-no-password-message' ``` ## Why was this MR needed? More alert-warning stripes are coming via the CI usage limits implementation in EE (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/965), and these layout margins and colors were becoming messy. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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~~ - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25743 See merge request !8151
| | * fix margin on alert stripes within ":flash_message" blockMike Greiling2016-12-161-3/+4
| | |
| * | Changed autocomplete_sources into an action that returns a single 'at' type ↵18435-autocomplete-is-not-performantLuke Bennett2016-12-151-3/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of sources at a time Finished up autocomplete_sources action and added frontend to fetch data only when its needed Added wait_for_ajax to specs Fixed builds and improved the setup/destroy lifecycle Changed global namespace and DRYed up loading logic Added safety for accidentally loading data twice Removed destroy as its not necessary and is messing with click events from a blur race condition Created AutocompleteSourcesController and updated routes Fixed @undefined from tabbing before load ends Disable tabSelectsMatch until we have loaded data Review changes
* | Merge branch 'master' into 'badge-color-on-white-bg'Dimitrie Hoekstra2016-12-163-25/+8
|\ \ | |/ | | | | | | | | | | # Conflicts: # app/assets/stylesheets/framework/nav.scss # app/assets/stylesheets/pages/environments.scss # app/views/layouts/nav/_group.html.haml # app/views/layouts/nav/_project.html.haml
| * Merge branch '23305-leave-project-and-leave-group-should-be-buttons' into ↵Jacob Schatz2016-12-092-23/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove 'Leave Project' and 'Leave Group' from settings dropdowns ## What does this MR do? Removes `Leave Project` and `Leave Group` from the settings dropdown. Adds it to the `views/shared/members/access_request_buttons.html.haml`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-11-19_at_15.34.26](/uploads/5c66a025513b4780a9e881f0036381e4/Screen_Shot_2016-11-19_at_15.34.26.png) ![Screen_Shot_2016-11-19_at_15.35.29](/uploads/ed74a5dfe982cf65bb49c0c4fb307061/Screen_Shot_2016-11-19_at_15.35.29.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23305 See merge request !7600