summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Finally fix stuff related to dynamic configDmitriy Zaporozhets2015-01-082-3/+7
| | | | | | |
* | | | | | | Improve application settings and write testsDmitriy Zaporozhets2015-01-082-8/+11
| | | | | | |
* | | | | | | Init ApplicationSettings resource with defaults from config fileDmitriy Zaporozhets2015-01-082-0/+10
| |/ / / / / |/| | | | |
* | | | | | Redesign signin/singup pagesDmitriy Zaporozhets2015-01-071-0/+5
| | | | | |
* | | | | | Restyle and refactor dashboard projects page filteringDmitriy Zaporozhets2015-01-061-0/+2
| | | | | |
* | | | | | Restyle and refactor milestones filterDmitriy Zaporozhets2015-01-062-12/+9
|/ / / / /
* | | | | Merge branch 'user_ssh_keys_on_admin' into 'master'Dmitriy Zaporozhets2014-12-301-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User ssh keys on admin Show user ssh keys on admin user page. See merge request !1362
| * | | | | Share the key table between admin and profile resources.Marin Jankovski2014-12-301-0/+8
| | | | | |
* | | | | | Helper for ajax group selectboxDmitriy Zaporozhets2014-12-301-0/+9
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq ↵Dmitriy Zaporozhets2014-12-281-0/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into vicvega-check_browser_version Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG app/assets/stylesheets/generic/common.scss
| * | | | check browser version, blacklisting outdated IE (version < 10)Francesco Coda Zabetta2014-12-241-0/+4
| |/ / /
* | | | Show assigned issues/mr be default on dashboardDmitriy Zaporozhets2014-12-261-34/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was default before but now it fixed with providing assignee_id parameter making url shareble and dont reset when other filters users. Also this commit removes old methods that are not used any more. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix nav_link support for several path optionsDmitriy Zaporozhets2014-12-251-19/+33
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Set of UI changes mostly for issue and merge requestDmitriy Zaporozhets2014-12-251-0/+18
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * return edit/close buttons to old position (right of title) * make 'Issue #1' header smaller * move mr commits to separate tab * change inline/side diff switcher to buttons from tabs * make issue sidebar start with dicsussion block Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'sidebar-nav' into 'master'Dmitriy Zaporozhets2014-12-246-66/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sidebar navigation This MR changes layout of the GitLab to sidebar navigation. Layouts: - [x] Project layout - [x] Project settings layout - [x] Dashboard layout - [x] Profile layout - [x] Group layout - [x] Snippets layout - [x] Admin layout Pages: - [x] Activity pages - [x] Issue/mr pages - [x] Issues/merge requests pages Common: - [x] Fix tests See merge request !1329
| * | | Refactor issues and merge requests listsDmitriy Zaporozhets2014-12-233-31/+18
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | One column issue/mr lists for projectDmitriy Zaporozhets2014-12-231-25/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Render MR diff full size of screenDmitriy Zaporozhets2014-12-221-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'master' into sidebar-navDmitriy Zaporozhets2014-12-212-5/+30
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/layouts/group.html.haml
| * | | | Restyle group page and event filterDmitriy Zaporozhets2014-12-161-7/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Left-side navigation for group layoutDmitriy Zaporozhets2014-12-161-1/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Prevent 500 after merge MR if you check remove source branchDmitriy Zaporozhets2014-12-231-1/+8
| |/ / / |/| | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #7886 from cirosantilli/disable-blob-edit-mrDmitriy Zaporozhets2014-12-201-5/+26
|\ \ \ \ | | | | | | | | | | Disable / hide MR edit blob button if cannot edit.
| * | | | Disable / hide MR edit blob button if cannot edit.Ciro Santilli2014-10-021-5/+26
| | | | |
* | | | | Add theme type css classDrew Blessing2014-12-151-0/+4
| |/ / / |/| | |
* | | | DRY and refactor atom codeDmitriy Zaporozhets2014-12-042-0/+37
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'multi_provider' into 'master'Dmitriy Zaporozhets2014-12-042-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supporting for multiple omniauth provider for the same user fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/1721 and https://dev.gitlab.org/gitlab/gitlabhq/issues/1760 See merge request !1296
| * | | | added helperValery Sizov2014-12-041-0/+4
| | | | |
| * | | | Supporting for multiple omniauth provider for the same userValery Sizov2014-12-041-2/+2
| | | | |
| * | | | Multi-provider auth. LDAP is not reworkedValery Sizov2014-12-041-1/+1
| | |/ / | |/| |
* | | | Set proper filter wordsDmitriy Zaporozhets2014-12-041-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Create helper for sort drowdown option namesDmitriy Zaporozhets2014-12-041-0/+17
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Render cross reference in issue titleDmitriy Zaporozhets2014-12-031-0/+12
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'reactivate-hljs-autodetection' into 'master'Dmitriy Zaporozhets2014-11-301-8/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reactivate highlight.js language autodetection ### What does this MR do? This commit partly reverts commit 0d13abb1 to reactivate highlight.js language autodetection. It does NOT revert the part that adds the `nohighlight` CSS-class for a predefined set of filenames (which was indeed the intended purpose of commit 0d13abb1). ### Are there points in the code the reviewer needs to double check? Not particularly, the only effect of this blob_helper is to add a CSS class to the `<pre>` container of the blob, to control the way highlight.js performs its syntax highlighting. (see where this helper is called at https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/views/shared/_file_hljs.html.haml#L12). However this merge request DOES change the way the syntax highlighting is done (by bringing it back to the situation before commit 0d13abb1 where highlight.js autodetected the language itself). So we can expect some new kind of syntax highlighting problems. However in this case, the issues should be forwarded to the upstream project (https://github.com/isagalaev/highlight.js). ### Why was this MR needed? The main motivation behind this partial revert is that there is no point (IMHO) in using an "intelligent" syntax highlighter which is specifically designed to autodetect languages if it is to dictate (via the CSS class) the language to use solely based on the filename extension. ### What are the relevant issue numbers / Feature requests? Issue #665 "HLJS language autodetection / syntax highlighting fails " ### Screenshots (If appropriate) See screenshots in issue #665 See merge request !232
| * | | revert using the extension of the blob to determine the syntax highlighting ↵Zertrin2014-11-181-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | language nohighlight functionality for a hardcoded set of filenames is kept
* | | | Hide gpg signature on tags page from tag messageDmitriy Zaporozhets2014-11-181-0/+5
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fork-to-group' into 'master'Dmitriy Zaporozhets2014-11-181-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fork to group Fixes #1592 * project can be forked into group * fork link always lead to fork page where you select namespace where to fork See merge request !1253
| * | | Improve fork to namespaces featureDmitriy Zaporozhets2014-11-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Show namespace thumbnail differently if project was already forked * Show loading spinner when click on fork * Fork link navigates to personal namespace only if no manageable groups exists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Clean the string with commit author and email.Marin Jankovski2014-11-141-2/+6
|/ / /
* | | Merge branch 'actions_in_the_inbox' into 'master'Dmitriy Zaporozhets2014-11-121-0/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actions in the inbox Related to #1607 See merge request !1247
| * | | Set action on issue/mr creation mail.Marin Jankovski2014-11-121-11/+23
| | | |
| * | | Create emails helper for actions links.Marin Jankovski2014-11-111-0/+20
| | | |
* | | | Merge branch 'add_issue_edited_timestamp' into 'master'Dmitriy Zaporozhets2014-11-121-0/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add issue edited timestamp Comments already have this feature. So, I think, issues should also have it. ![Снимок экрана 2014-11-08 в 17.07.10](https://gitlab.com/uploads/vernik91/gitlab-ce/4e87a15130/%D0%A1%D0%BD%D0%B8%D0%BC%D0%BE%D0%BA_%D1%8D%D0%BA%D1%80%D0%B0%D0%BD%D0%B0_2014-11-08_%D0%B2_17.07.10.png) See merge request !235
| * | | Add issue edited timestampNikita Verkhovin2014-11-081-0/+13
| | | |
* | | | make repo name link to repo homepageBen Bodenmiller2014-11-091-2/+2
|/ / /
* | | Remove unneeded backslash: "\/" == "/"Ciro Santilli2014-11-041-1/+1
| | |
* | | Add refactoring for multiple LDAP server supportJan-Willem van der Meer2014-10-131-1/+1
| | | | | | | | | | | | These changes are ported from EE to CE. Apply changes for app directory
* | | Merge pull request #8020 from mr-vinn/note-trunc-linkDmitriy Zaporozhets2014-10-132-9/+58
|\ \ \ | | | | | | | | | | | | Improve event note display in dashboard and project activity views
| * | | Improve dashboard note view and add testsVinnie Okada2014-10-122-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the `#first_line_in_markdown` method so that the first line of parsed text is displayed more reliably, and the continuation indicators ("...") are displayed in all cases where the note is truncated. Also add Rspec tests for `EventsHelper#event_note`.
| * | | Preserve link href in truncated note viewVinnie Okada2014-10-122-7/+41
| | |/ | |/| | | | | | | | | | | | | Notes on the dashboard views are truncated to 150 characters; this change ensures that when a link's text is truncated it still points to the correct URL.
View Lorry Controller Status