summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Minor code cleanupnotification-levelsDouwe Maan2015-09-201-9/+6
|
* Merge branch 'master' into notification-levelsPatricio Cano2015-09-1613-3/+379
|\
| * Eliminate combined image_tag and image_path in providers listStan Hu2015-09-161-1/+1
| |
| * Fix default avatars to ensure that helpers don't have /assets dir appendedStan Hu2015-09-162-2/+2
| |
| * Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2015-09-153-18/+63
| |\ | | | | | | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
| * | Make small ui fixes for CIDmitriy Zaporozhets2015-09-141-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix navigation and header tileKamil Trzcinski2015-09-141-0/+9
| | | | | | | | | | | | Remove redundant navigation on commits and builds page
| * | Fix build triggers URL and slack notificationsKamil Trzcinski2015-09-142-3/+3
| | |
| * | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-111-0/+22
| |\ \ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | CLeanup CI helpers since we dont use oauth any moreDmitriy Zaporozhets2015-09-111-32/+0
| | | |
| * | | Fix ci commits features specsDmitriy Zaporozhets2015-09-111-1/+5
| | | |
| * | | remove gitlab_ci configValery Sizov2015-09-102-4/+4
| | | |
| * | | integration with gitlab authValery Sizov2015-09-091-1/+1
| | | |
| * | | Move helpers back to original directoryDmitriy Zaporozhets2015-09-0984-3290/+3138
| | | |
| * | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan2015-08-262-0/+43
| |\ \ \
| * | | | Update gitignore, change literal DB table names, fix errors, fix fontawesomeDouwe Maan2015-08-262-4/+4
| | | | |
| * | | | Groundwork for merging CI into CEDouwe Maan2015-08-2597-3196/+3676
| | | | |
* | | | | Merge branch 'master' into notification-levelsPatricio Cano2015-09-164-18/+85
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Add current_ref helper methodheader-titlesDmitriy Zaporozhets2015-09-141-2/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add page titles to header for group and projectDmitriy Zaporozhets2015-09-142-17/+60
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix tooltip display in list viewsDrew Blessing2015-09-141-1/+1
| | |_|/ | |/| |
| * | | Fix fixed layoutDmitriy Zaporozhets2015-09-101-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Style panels and add blank containerDmitriy Zaporozhets2015-09-091-0/+22
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Added Global to the drop downs and updated the label of the button to show ↵Patricio Cano2015-09-161-7/+15
| | | | | | | | | | | | | | | | the current level instead of `Notifications`
* | | | Notification dropdown now shows currently active level, and also shows what ↵Patricio Cano2015-09-141-5/+14
| | | | | | | | | | | | | | | | the actual value of `global` is, if the project has the notification level set to global.
* | | | Corrected `case` indentation to conform with RubocopPatricio Cano2015-09-141-22/+22
| | | |
* | | | Added spacing to icons in Notification drop downPatricio Cano2015-09-141-4/+4
| | | |
* | | | Notification level can now be saved from within the project view.Patricio Cano2015-09-141-8/+12
| | | |
* | | | Fixed notification level list item helper.Patricio Cano2015-09-141-12/+8
| | | |
* | | | PAtrially working notification buttonDarby2015-09-141-0/+31
|/ / /
* | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-09-071-0/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ui improvements * fix project home page when activity set as default * style commits, branches and tags pages to new style * render flash message outside of content block * style group pages See merge request !1255
| * | | Restyle group pages. Merge header with page titleDmitriy Zaporozhets2015-09-071-0/+9
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'crowd' into 'master'Valery Sizov2015-09-071-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228
| * | | | Crowd integrationValery Sizov2015-09-021-1/+5
| | | | |
* | | | | Merge branch 'fix-wiki-page-history' into 'master'Douwe Maan2015-09-071-24/+0
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken Wiki Page History This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes. Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399 See merge request !1232
| * | | | Fix broken Wiki Page HistoryStan Hu2015-09-011-24/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399
* | | | Fix testsDmitriy Zaporozhets2015-09-031-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Replace obvious tooltips. Fix line-height for top navDmitriy Zaporozhets2015-09-031-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Redesign activity feed on dashboard and project pagesDmitriy Zaporozhets2015-09-031-6/+4
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Remove PreferencesHelper include from GitlabMarkdownHelperrs-cleanup-redcarpet-rendererRobert Speicher2015-09-011-2/+0
| | |
* | | Make sure the `gfm` helper passes the required optionsRobert Speicher2015-08-311-1/+9
| | | | | | | | | | | | This adds some duplication, but this helper is temporary.
* | | Make `gfm` delegate to `Gitlab::Markdown.gfm` instead of `markdown`Robert Speicher2015-08-311-1/+1
| | | | | | | | | | | | | | | Some usages of the `gfm` helper depend on the text not being rendered as standard Markdown. Ugh.
* | | Fix context options in `markdown` helperRobert Speicher2015-08-311-5/+5
| | | | | | | | | | | | We need to send `path`, not `requested_path`.
* | | Add a temporary `gfm` helper that just delegates to `markdown`Robert Speicher2015-08-271-0/+6
| | | | | | | | | | | | | | | Some views are still calling `gfm` directly. We'll need to update them to instead call `markdown` with a `pipeline: ...` argument.
* | | Restore the forwarded HTML options in link_to_gfmRobert Speicher2015-08-271-0/+5
| | |
* | | Decouple Gitlab::Markdown from the GitlabMarkdownHelperRobert Speicher2015-08-271-24/+10
| | | | | | | | | | | | | | | This module is now the sole source of knowledge for *how* we render Markdown (and GFM).
* | | Merge branch 'rs-remove-user-color-scheme-class' into 'master'Douwe Maan2015-08-272-25/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply syntax highlighting to fenced code blocks client-side Instead of applying the syntax highlighting scheme class to these blocks server-side, we use Javascript and Gon to apply the user's color scheme (or the default) client-side. This will make it easier to cache these blocks in the future because they're no longer state-dependent. See merge request !1203
| * | Re-add user_color_scheme helperRobert Speicher2015-08-261-1/+5
| | | | | | | | | | | | Update PreferencesHelper specs
| * | Remove user_color_scheme_classRobert Speicher2015-08-252-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of rendering this value server-side, we use Javascript and Gon to apply the user's color scheme (or the default) to any syntax highlighted code blocks. This will make it easier to cache these blocks in the future because they're no longer state-dependent.
| * | Add Gitlab::ColorSchemes moduleRobert Speicher2015-08-251-23/+2
| |/ | | | | | | | | Very similar to Gitlab::Theme, this contains all of the definitions for our syntax highlighting schemes.
View Lorry Controller Status