summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
...
| * Changed to using the btn classvis_btn_color_changeDarby2015-07-101-1/+1
| |
* | Merge branch 'fork_visibility_level' into 'master'Dmitriy Zaporozhets2015-07-102-0/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | Forks should not have more permissive visibility levels than the original https://dev.gitlab.org/gitlab/gitlabhq/issues/2286 See merge request !936
| * | Fork visibility level fixfork_visibility_levelValery Sizov2015-07-062-0/+16
| | |
* | | Merge branch 'comment-box-changes' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-101-1/+1
|\ \ \
| * | | Fixed the issuescomment-box-changesDarby2015-07-091-1/+1
| | | |
| * | | Comment box/Placeholder text redoDarby2015-07-011-1/+1
| | | |
* | | | Cache readme rendering resultDmitriy Zaporozhets2015-07-091-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'project-home-page'Dmitriy Zaporozhets2015-07-091-0/+6
|\ \ \ \
| * | | | Show last push widget on several project pagesDmitriy Zaporozhets2015-07-081-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Properly render plain readmeDmitriy Zaporozhets2015-07-091-0/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'rs-dev-issue-2372' into 'master'Dmitriy Zaporozhets2015-07-081-0/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter by issues/merge requests without a milestone Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2372 See merge request !886
| * | | | Rename NoMilestone to Milestone::NoneRobert Speicher2015-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | Also refactors IssuableFinder to avoid redundant title check.
| * | | | Allow user to filter by Issues/Merge Requests without a MilestoneRobert Speicher2015-07-061-0/+2
| | |/ / | |/| |
* | | | Recommend user to create README file for both empty and existing projectDmitriy Zaporozhets2015-07-081-0/+7
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Refactor star and fork buttonsDmitriy Zaporozhets2015-07-081-47/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Move project activity to separate tab. Add more features to project home pageDmitriy Zaporozhets2015-07-072-1/+5
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'group_settings_nav' into 'master'Douwe Maan2015-07-011-8/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix consistency issue in sidebars of Project and Group Settings. Fixes #2277 ![before_after_group_settings_nav](https://dev.gitlab.org/gitlab/gitlabhq/uploads/370c701d0eff8f1f8e44cf954c75f2bf/before_after_group_settings_nav.png) See merge request !1871
| * | | Fix consistency issue in sidebars of Project and Group Settings.Nicolas2015-06-241-8/+0
| | |/ | |/| | | | | | | Fixes #2277.
* | | Merge branch 'fix-relative-submodule-namespace-path' into 'master'Dmitriy Zaporozhets2015-06-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path ### What does this MR do? This MR fixes a bug in resolving a namespace when the `name` differed from `path`. ### Why was this MR needed? The original code was using `name`, when the proper input to `namespace_project_path` was `path`. ### What are the relevant issue numbers? Closes #1849 See merge request !864
| * | | Fix Error 500 when relative submodule resolves to a namespace that has a ↵Stan Hu2015-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | different name from its path Closes #1849
* | | | Merge branch 'permission-improvements' into 'master'Dmitriy Zaporozhets2015-06-261-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update permissions for issue tracker management Don't allow guest or reporter to set assignee, milestone and label when create or update new issue and merge request. After this change `Guest` and `Reporter` rule is used to report issues but only `Developer` and higher roles can manage issues (schedule milestone, assign to user or close any issue) Also I removed some duplication code between issues and merge requests and put all issuable partials in one directory See merge request !890
| * | | | Refactor issue and merge request sidebarDmitriy Zaporozhets2015-06-251-0/+8
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Add SAML to list of social_providermatt-firtion/gitlab-ce-SAML_1888Matthew Firtion2015-06-251-1/+1
|/ / /
* | | Prefix random Markdown tips with "Tip:"rs-random-placeholder-tipRobert Speicher2015-06-241-1/+1
| | |
* | | Show a random Markdown tip in the textarea placeholderRobert Speicher2015-06-231-0/+23
| |/ |/|
* | Fixed invalid timestamps in RSS feed #1771Rowan Wookey2015-06-231-1/+1
|/
* Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets2015-06-221-3/+2
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/merge_requests.rb
| * Revert merge request states renamingDmitriy Zaporozhets2015-06-191-3/+2
| | | | | | | | | | | | | | | | Replaced: * "Accepted" with "Merged" * "Rejected" with "Closed" Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'rs-rspec3' into 'master'Dmitriy Zaporozhets2015-06-223-4/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | RSpec3 Upgrades rspec to 3.3.0, we're now up-to-date! :tada: See merge request !831
| * | Update mock and stub syntax for specsRobert Speicher2015-06-223-4/+15
| | |
* | | Merge branch 'rs-remove-link-to-override'Dmitriy Zaporozhets2015-06-221-33/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/helpers/application_helper_spec.rb
| * | | Remove overridden `link_to` helperrs-remove-link-to-overrideRobert Speicher2015-06-171-33/+0
| | |/ | |/| | | | | | | The purpose for this override is now handled by `ExternalLinkFilter`.
* | | Merge branch 'new-logo' into 'master'Dmitriy Zaporozhets2015-06-221-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Replace old logo with new one Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @JobV @sytses See merge request !848
| * | Replace old logo with new onenew-logoDmitriy Zaporozhets2015-06-191-1/+1
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Update time_ago_with_tooltip helperRobert Speicher2015-06-174-13/+32
|/ | | | Minor refactoring, add specs, changes arguments to use keywords.
* Support commenting on a diff in side-by-side viewStan Hu2015-06-161-4/+6
| | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9283
* Refactor dashboard_choicesRobert Speicher2015-06-131-13/+16
|
* Make the dashboard choice text match the text in the sidebarRobert Speicher2015-06-131-2/+2
|
* Add a form field to customize the dashboard preferenceRobert Speicher2015-06-131-0/+19
|
* Add PreferencesHelper moduleRobert Speicher2015-06-133-29/+32
| | | | | | | Consolidates the helpers related to user preferences. Renames `app_theme` to `user_application_theme` to better explain what it is.
* Add Gitlab::Themes module; remove Gitlab::ThemeRobert Speicher2015-06-131-5/+2
| | | | | | | Now we can simply loop through all themes, among other things. This also removes the `dark_theme` / `light_theme` classes and the `theme_type` helper, since they weren't used anywhere.
* Move Project Members link from Settings to main menu.Nicolas2015-06-091-1/+1
| | | | Addresses #2278.
* Merge branch 'ignore-references' into 'master'Dmitriy Zaporozhets2015-06-021-15/+12
|\ | | | | | | | | | | | | | | Don't notify users mentioned in code blocks or blockquotes. cc @rspeicher See merge request !753
| * Actually ignore references in code blocks etc.Douwe Maan2015-06-021-15/+12
| |
* | Remove now-unused `escaped_autolink` helper and rails_autolink gemRobert Speicher2015-06-021-4/+0
|/
* Merge branch 'rs-issue-1721' into 'master'Douwe Maan2015-06-021-3/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link_to_gfm with only a reference having the incorrect link Before: ```ruby link_to_gfm("#4", "/foo") # => "<a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" ``` After: ```ruby link_to_gfm("#4", "/foo") # => "<a href="/foo">#4</a>" link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" ``` Closes #192 Closes #1721 Closes [GitHub #7115](https://github.com/gitlabhq/gitlabhq/issues/7115) See merge request !739
| * Fix link_to_gfm with only a reference having the incorrect linkrs-issue-1721Robert Speicher2015-05-291-3/+16
| | | | | | | | Closes #1721
* | Merge branch 'leave-project' into 'master'Dmitriy Zaporozhets2015-05-291-0/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | Add ability to leave project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !744
| * | Add ability to leave projectDmitriy Zaporozhets2015-05-291-0/+12
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add option to disallow users from registering any application to use GitLab ↵user-oauth-applicationsDouwe Maan2015-05-291-0/+4
|/ | | | as an OAuth provider
View Lorry Controller Status