summaryrefslogtreecommitdiff
path: root/app/views/layouts
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-141-2/+6
|\ | | | | | | | | | | | | | | | | | | | | Unsubscribe from thread through link in email footer Closes #3437 ![Screenshot_from_2015-12-11_15-35-06](/uploads/cfb3d8737d4757f527995411f103d0ce/Screenshot_from_2015-12-11_15-35-06.png) ![Screenshot_from_2015-12-11_15-35-56](/uploads/9b7121be7ce4b05e5995ca6d38c5bea4/Screenshot_from_2015-12-11_15-35-56.png) See merge request !2068
| * #can_unsubscribe? -> #?unsubscribable?Zeger-Jan van de Weg2016-01-111-1/+1
| |
| * Add #can_unsubscribe? to SentNotificationZeger-Jan van de Weg2016-01-091-1/+1
| |
| * Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-091-2/+6
| |
* | Merge branch 'remove-gray-bg'Dmitriy Zaporozhets2016-01-141-1/+1
|\ \ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add suport for layout without containerDmitriy Zaporozhets2016-01-131-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Update broadcast_message helperRobert Speicher2016-01-131-4/+1
| | | | | | | | | | | | | | | Now it returns the fully-formatted message so we can be consistent about how it's shown.
* | | Style the broadcast message formRobert Speicher2016-01-131-1/+1
|/ /
* | Only load autocomplete data when actually neededYorick Peterse2016-01-111-3/+5
|/ | | | | Previously this would result in autocomplete data being loaded for every page (e.g. the page showing all Git branches of a project).
* Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-071-2/+1
|
* Don't override issue page description in project layout.Douwe Maan2016-01-063-2/+4
|
* Make `page_description` less magical :sparkles:Robert Speicher2016-01-052-6/+8
|
* Merge branch 'master' into more-opengraphDouwe Maan2016-01-056-15/+15
|\ | | | | | | | | # Conflicts: # app/views/layouts/_head.html.haml
| * Merge branch 'rs-delimit-all-the-things' into 'master' Dmitriy Zaporozhets2016-01-045-12/+12
| |\ | | | | | | | | | | | | | | | | | | number_with_delimiter most of the things See merge request !2258
| | * number_with_delimiter most of the thingsrs-delimit-all-the-thingsRobert Speicher2015-12-315-12/+12
| | |
| * | 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
* | Add Open Graph data for group, project and commit.Douwe Maan2015-12-251-5/+5
|/
* Add link to twitter docsDouwe Maan2015-12-251-1/+2
|
* Add more twitter metatags.Douwe Maan2015-12-251-0/+6
|
* Add og:site_nameDouwe Maan2015-12-251-2/+2
|
* Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-241-0/+1
|
* Use `request.fullpath` for `og:url` tagRobert Speicher2015-12-241-1/+1
|
* Add page descriptions and imagesRobert Speicher2015-12-231-4/+8
| | | | | | | | | | A limited number of pages have defined their own descriptions, but otherwise we default to the Project's description (if `@project` is set), or the old `brand_title` fallback. The image will either be the uploaded project icon (never a generated one), the user's uploaded icon or Gravatar, or, finally, the GitLab logo.
* Add Open Graph meta tagsRobert Speicher2015-12-231-1/+5
|
* Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-111-1/+1
|
* Migrate CI::Project to ProjectKamil Trzcinski2015-12-116-78/+11
|
* Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-101-10/+0
|
* Move Network page from separate tab to sub tab of CommitsDmitriy Zaporozhets2015-12-091-8/+8
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'ui/sidebar' into 'master' Dmitriy Zaporozhets2015-12-0412-94/+94
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Sidebar & header tweaks and fixes Depends on !1953 See the commits for more details, the messages mostly speak for themselves. ![Logo](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ba088150165bb0a0aea1e894f3443f43/logo_tooltip.png) ![Sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1e8c09ac3bf489cdb9531eebea18c90/sidebar_tooltips.png) Fixes #2928, #2071, https://dev.gitlab.org/gitlab/gitlabhq/issues/2575, and https://dev.gitlab.org/gitlab/gitlabhq/issues/2573 See merge request !1958
| * Page titles are title case.Douwe Maan2015-12-021-2/+2
| |
| * Fix header tooltip alignmentDouwe Maan2015-12-021-6/+6
| |
| * Restore sidebar tooltips and fix logo tooltip locationDouwe Maan2015-12-0210-86/+86
| |
* | Fix background and padding of login and error pagesui/login-pageDouwe Maan2015-12-032-3/+3
|/
* Merge branch 'impersonate' into 'master' Dmitriy Zaporozhets2015-11-141-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor login as to be impersonation with better login/logout Modifies the existing "login as" feature to be called impersonation. This also adds: * Application keep track of who is impersonating the user so they can revert back to the original user without having to log out. * Stores the user profile via `HTTP_REFERER` so you get redirected back to the person you have impersonated once you stop. ## Screenshots: ![](http://sindacio.us/i/2015-10-28_17-52-41.png) ![](http://sindacio.us/i/2015-10-28_17-53-08.png) See merge request !1702
| * refactor login as to be impersonation with better login/logoutJames Newton2015-10-291-0/+4
| | | | | | | | | | | | Modifies the existing "login as" feature to be called impersonation, as well as keeping track of who is impersonating to revert back to that user without having to log out.
* | Expose CI enable option in project featuresKamil Trzcinski2015-11-131-1/+1
| | | | | | | | - Enable CI by default for all new projects
* | Merge branch ↵Dmitriy Zaporozhets2015-11-111-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'add-comment-to-one-link-in-email-to-prevent-people-adding-it-back' into 'master' Prevent people from adding the link back. See merge request !1938
| * | Fix typo in email comment: hone -> oneDmitriy Zaporozhets2015-11-111-2/+2
| | |
| * | Prevent people from adding the link back.Sytse Sijbrandij2015-11-061-0/+1
| | |
* | | Replace CoffeeScript block into JavaScript in Views.Jason Lee2015-11-101-2/+2
| | | | | | | | | | | | | | | | | | | | | For example view: shared/issuable/_context CoffeeScript: 190ms JavaScript: 19.7ms
* | | Merge remote-tracking branch 'origin/release-notes'Dmitriy Zaporozhets2015-11-101-1/+1
|\ \ \ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add ability to edit and show release notesDmitriy Zaporozhets2015-11-051-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Added navigation link to SherlockYorick Peterse2015-11-091-0/+5
| | | |
* | | | Update piwik templateAchilleas Pipinellis2015-11-081-8/+10
| | | |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-061-8/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | CI details cleanupKamil Trzcinski2015-11-051-8/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add page titles to CI settings. - Fix CI admin navigation. - Remove duplicated scope. - Use monospace font for commit sha. - Add page title and header title to build page. - Proper authorization for cancel/retry builds. - Use gitlab pagination theme for builds and group members. - Don't paginate builds widget on build page. - Add badges to commit page Changes/Builds tabs. - Add "Builds" to commit Builds tab page title. - Add and use Ci::Build#retryable? method. - Add CI::Build#retried? method. - Allow all failed commit builds to be retried. - Proper authorization for cancel/retry all builds. - Remove unused param. - Use time_ago_with_tooltip where appropriate. - Tweak builds index text - Remove duplication between builds/build and commit_statuses/commit_status. - Use POST rather than GET for canceling and retrying builds. - Remove redundant URL helpers. - Add build ID to build page. - Link branch name on build page. - Move commit/:sha/ci to commit/:sha/builds.
* | | Only have one link in emails to make clicking it easier.Sytse Sijbrandij2015-11-051-2/+2
|/ /
* | Better name for up-level linksgo-to-navDmitriy Zaporozhets2015-11-035-12/+12
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add support for searching commit log messagesJonathan Schoeffling2015-10-281-0/+2
| | | | | | | | | | | | | | | | Include the log messages of recent commits in project-level search results, providing functionality similar to 'git log --grep'. Update repository model rspec tests to validate the output of Repository#commits_with_log_matching.
* | Remove deprecated CI events from project settings pageDmitriy Zaporozhets2015-10-282-16/+0
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>