Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-17Remove duplicate codeKamil Trzcinski
2015-09-17Check current_controller against controller_pathKamil Trzcinski
The controller_path includes namespaces, where controller_name only includes the class name without controller
2015-09-17Merge branch 'fix-issue-2382' into 'master'Stan Hu
Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png) Closes #2382 See merge request !1227
2015-09-16Eliminate combined image_tag and image_path in providers listStan Hu
2015-09-16Fix default avatars to ensure that helpers don't have /assets dir appendedStan Hu
2015-09-15Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski
ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
2015-09-15Create a "destroyed Milestone" event and keep Milestone events around in the DBStan Hu
for posterity. Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Add "in" preposition when creating and destroying milestones Closes #2382
2015-09-14Make small ui fixes for CIDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-14Add current_ref helper methodDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-14Add page titles to header for group and projectDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-14Fix tooltip display in list viewsDrew Blessing
2015-09-14Fix navigation and header tileKamil Trzcinski
Remove redundant navigation on commits and builds page
2015-09-14Fix build triggers URL and slack notificationsKamil Trzcinski
2015-09-11Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-11CLeanup CI helpers since we dont use oauth any moreDmitriy Zaporozhets
2015-09-11Fix ci commits features specsDmitriy Zaporozhets
2015-09-10remove gitlab_ci configValery Sizov
2015-09-10Fix fixed layoutDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10Style panels and add blank containerDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09integration with gitlab authValery Sizov
2015-09-09Move helpers back to original directoryDmitriy Zaporozhets
2015-09-07Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets
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
2015-09-07Merge branch 'crowd' into 'master'Valery Sizov
Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228
2015-09-07Restyle group pages. Merge header with page titleDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-07Merge branch 'fix-wiki-page-history' into 'master'Douwe Maan
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
2015-09-03Fix testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03Replace obvious tooltips. Fix line-height for top navDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03Redesign activity feed on dashboard and project pagesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-02Crowd integrationValery Sizov
2015-09-02Fix broken Wiki Page HistoryStan Hu
Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399
2015-09-01Remove PreferencesHelper include from GitlabMarkdownHelperRobert Speicher
2015-09-01Make sure the `gfm` helper passes the required optionsRobert Speicher
This adds some duplication, but this helper is temporary.
2015-08-31Make `gfm` delegate to `Gitlab::Markdown.gfm` instead of `markdown`Robert Speicher
Some usages of the `gfm` helper depend on the text not being rendered as standard Markdown. Ugh.
2015-08-31Fix context options in `markdown` helperRobert Speicher
We need to send `path`, not `requested_path`.
2015-08-28Add a temporary `gfm` helper that just delegates to `markdown`Robert Speicher
Some views are still calling `gfm` directly. We'll need to update them to instead call `markdown` with a `pipeline: ...` argument.
2015-08-28Restore the forwarded HTML options in link_to_gfmRobert Speicher
2015-08-28Decouple Gitlab::Markdown from the GitlabMarkdownHelperRobert Speicher
This module is now the sole source of knowledge for *how* we render Markdown (and GFM).
2015-08-27Merge branch 'rs-remove-user-color-scheme-class' into 'master'Douwe Maan
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
2015-08-27Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan
2015-08-27Update gitignore, change literal DB table names, fix errors, fix fontawesomeDouwe Maan
2015-08-26Re-add user_color_scheme helperRobert Speicher
Update PreferencesHelper specs
2015-08-26Limit content width for big screens except certain pagesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26Groundwork for merging CI into CEDouwe Maan
2015-08-26Remove user_color_scheme_classRobert Speicher
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.
2015-08-26Add Gitlab::ColorSchemes moduleRobert Speicher
Very similar to Gitlab::Theme, this contains all of the definitions for our syntax highlighting schemes.
2015-08-22Merge branch 'reply-by-email' into 'master'Robert Speicher
Reply by email Fixes #1360. It's far from done, but _it works_. See merge request !1173
2015-08-22Merge branch 'fix-email-autocomplete' into 'master'Douwe Maan
Fix bug preventing invite by e-mail This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320 See merge request !1181
2015-08-21Fix bug preventing invite by e-mailStan Hu
This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320
2015-08-21Remove weirdness.Douwe Maan
2015-08-20Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets