summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Make sure issue assignee is properly reset.Douwe Maan2015-03-241-12/+1
|
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-231-0/+4
|\
| * Fix #8966 Remove Milestones/Labels from project navbar when Isses disabledvichak2015-03-231-0/+4
| |
* | Update views to single form of address. Change "my" to "your"Dmitriy Zaporozhets2015-03-221-3/+3
|/
* Restyle oauth accounts at profile page and add ability to unlink accountimprove-profileDmitriy Zaporozhets2015-03-213-13/+10
|
* Link to CI with refValery Sizov2015-03-201-1/+1
|
* Fix project issues and merge requests pagesDmitriy Zaporozhets2015-03-191-1/+0
|
* Merge branch 'changelog-link' into 'master'Dmitriy Zaporozhets2015-03-181-2/+35
|\ | | | | | | | | | | | | | | | | | | Add changelog, license and contribution guide links to project sidebar. If the version is known, the "Version: 7.9.0pre" button links to the changelog, otherwise a "View changelog" button is shown. ![Screen_Shot_2015-03-18_at_14.22.29](https://dev.gitlab.org/gitlab/gitlabhq/uploads/747acc018ec9a188098e0f0bc4e91cc3/Screen_Shot_2015-03-18_at_14.22.29.png) See merge request !1708
| * Add license and contribution guide links to project sidebar.Douwe Maan2015-03-181-2/+35
| |
* | List new commits for newly pushed branch in activity view.Douwe Maan2015-03-181-1/+1
|/
* Merge branch 'external_wiki' into 'master'Dmitriy Zaporozhets2015-03-181-0/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for external wikis ## What does this MR do? This MR adds the possibility to replace the link to the internal wiki of gitlab with a custom link. Currently this is realised as a service. ## What Use Case does this MR solve? In my Company we already have a wiki System (Confluence). We have a policy to use the existing wiki, so we can't switch to the internal wiki Gitlab provides. This currently only leaves us two choices: 1. Disable the gitlab wiki. That means we completly loose the connection between wiki and code from the gitlab ui. 2. Create a simple wiki page with a link to our external wiki and hope that no one uses the internal one. Both solutions are not really good. So what can be done to improve the situation while making it as easy as possible for new developers to access both, wiki and gitlab? Replacing the wiki link kinda like the JIRA integration replaces the issues link looks like a good first step to me. :) This can probably be extended later to completly prevent access to the internal wiki (currently that's still possible if you know the link) or maybe to check if the link really points to a wiki. ## Screenshot: ![external_wiki_service](https://gitlab.com/uploads/gitlab-org/gitlab-ce/89b27cf068/external_wiki_service.png) See merge request !291
| * Add a service to support external wikisHannes Rosenögger2015-03-121-0/+11
| |
* | Handle null restricted_visibility_levels settingVinnie Okada2015-03-161-1/+1
| | | | | | | | | | Fix a 500 error when the `restricted_visibility_levels` setting is null in the database.
* | Merge branch 'fix-restricted-visibility' into 'master'Dmitriy Zaporozhets2015-03-163-3/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restricted visibility levels - bug fix and new feature This allows admin users to override restricted visibility settings when creating and updating projects and snippets, and moves the restricted visibility configuration from gitlab.yml to the web UI. See #1903. ## Move configuration location I added a new section to the application settings page for restricted visibility levels. Each level has a checkbox, styled with Bootstrap to look like a toggle button. A checked box means that the level is restricted. I added a glowing text shadow and changed the background color for checked buttons because the default styles made it hard to distinguish between checked and unchecked. This image shows the new section with the "Public" box checked: ![restricted_visibility_settings](https://dev.gitlab.org/Okada/gitlabhq/uploads/629562e4313f89b795e81c3bb0f95893/restricted_visibility_settings.png) ## Allow admins to override To allow admin users to override the restricted visibility levels, I had to remove the `visibility_level` validation from the `Project` class. The model doesn't know about the `current_user`, which should determine whether the restrictions can be overridden. We could use the creator in the validation, but that wouldn't work correctly for projects where a non-admin user is the creator and an admin tries to change the project to a restricted visibility level. The `Project::UpdateService` and `Project::CreateService` classes already had code to determine whether the current user is allowed to use a given visibility level; now all visibility level validation is done in those classes. Currently, when a non-admin tries to create or update a project using a restricted level, these classes silently set the visibility level to the global default (create) or the project's existing value (update). I changed this behavior to be more like an Active Model validation, where using a restricted level causes the entire request to be rejected. Project and personal snippets didn't have service classes, and restricted visibility levels weren't being enforced in the model or the controllers. The UI disabled radio buttons for restricted levels, but that wouldn't be difficult to circumvent. I created the `CreateSnippetService` and `UpdateSnippetService` classes to do the same restricted visibility check that the project classes do. And since I was dealing with snippet visibility levels, I updated the API endpoints for project snippets to allow users to set and update the visibility level. ## TODO * [x] Add more tests for restricted visibility functionality cc @sytse @dzaporozhets See merge request !1655
| * \ Merge branch 'master' into fix-restricted-visibilityVinnie Okada2015-03-1411-31/+83
| |\ \ | | | | | | | | | | | | | | | | Conflicts: db/schema.rb
| * | | More restricted visibility changesVinnie Okada2015-03-101-1/+2
| | | | | | | | | | | | | | | | Bug fixes and new tests for the restricted visibility changes.
| * | | Enforce restricted visibilities for snippetsVinnie Okada2015-03-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add new service classes to create and update project and personal snippets. These classes are responsible for enforcing restricted visibility settings for non-admin users.
| * | | Move restricted visibility settings to the UIVinnie Okada2015-03-072-2/+19
| | | | | | | | | | | | | | | | | | | | Add checkboxes to the application settings page for restricted visibility levels, and remove those settings from gitlab.yml.
* | | | Use `project_member` instead of `team_member`.Douwe Maan2015-03-152-2/+2
| |/ / |/| |
* | | Refactor buttonsDmitriy Zaporozhets2015-03-141-2/+2
| | |
* | | Merge branch 'group-icon-performance' into 'master'Dmitriy Zaporozhets2015-03-123-10/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent database query each time we render group avatar Fixes #2118 See merge request !1688
| * | | Prevent database query each time we render group avatarDmitriy Zaporozhets2015-03-123-10/+13
| | |/ | |/|
* | | Merge branch 'replace_passwords_with_asterisk' into 'master'Marin Jankovski2015-03-121-0/+10
|\ \ \ | |/ / |/| | | | | | | | | | | Show asterisks instead of password in service edit form. See merge request !1686
| * | Show asterisks instead of password in service edit form.Marin Jankovski2015-03-121-0/+10
| | |
* | | replace images in emails with inline imagesHannes Rosenögger2015-03-121-0/+25
|/ / | | | | | | | | | | This adds the functionality of replacing all images that were uploaded to gitlab with inline images(base64) in emails. This change fixes the broken images in emails that 7.8 introduced
* | Merge branch 'markdown-smb-link' into 'master'Dmitriy Zaporozhets2015-03-121-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Allow smb:// links in Markdown text. As requested by Sam McLeod at https://gitlab.com/gitlab-org/gitlab-ce/issues/1184 See merge request !1669
| * | Allow smb:// links in Markdown text.Douwe Maan2015-03-101-1/+1
| | |
* | | Merge branch 'fix-code-preview' into 'master'Marin Jankovski2015-03-112-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix code preview theme setting for comments, issues, merge requests, and snippets User color scheme was not being used: default white color scheme was always chosen. Also, default background for code in notes was always overriding the user color scheme. Closes #1139 See merge request !357
| * | | Fix code preview theme setting for comments, issues, merge requests, and ↵Stan Hu2015-03-102-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | snippets. Also preserve code preview color scheme in events dashboard. Assign default colors to all code blocks shown as <pre class="code highlight [color_scheme]"> Closes #1139
* | | Add project filter by visibility and tag to explore pageDmitriy Zaporozhets2015-03-102-16/+17
|/ /
* | Render milestone progress with one helper methodDmitriy Zaporozhets2015-03-091-0/+11
|/
* Added comment notification events to HipChat and Slack services.Stan Hu2015-03-061-0/+4
| | | | | | | | | Supports four different event types all bundled under the "note" event type: - comments on a commit - comments on an issue - comments on a merge request - comments on a code snippet
* Merge branch 'dashboard-milestones' into 'master'Dmitriy Zaporozhets2015-03-041-0/+2
|\ | | | | | | | | | | | | | | | | | | Add dashboard milestones. Closes #1422. ![Screen_Shot_2015-03-03_at_16.20.36](https://dev.gitlab.org/gitlab/gitlabhq/uploads/795b480a2552e1d26436c3db2158cb81/Screen_Shot_2015-03-03_at_16.20.36.png) See merge request !1621
| * Add dashboard milestones.Douwe Maan2015-03-031-0/+2
| |
* | Fix bug where editing a comment with "+1" or "-1" would cause a server errorStan Hu2015-03-021-3/+3
|/ | | | Closes #1151
* Fix broken `project_url` routing when protected branches are accessed with ↵Stan Hu2015-03-011-0/+16
| | | | an empty repo
* Merge pull request #8890 from sue445/feature/project_api_avatar_urlJeroen van Baarsen2015-03-011-4/+2
|\ | | | | Expose avatar_url in projects API
| * Expose avatar_url in projects APIsue4452015-03-011-4/+2
| | | | | | | | | | | | * Impl Project#avatar_url * Refactor ApplicationHelper: Use Project#avatar_url * Update changelog
* | Merge branch 'route-helper' into 'master'Dmitriy Zaporozhets2015-02-272-2/+33
|\ \ | | | | | | | | | | | | | | | Introduce shortcuts for routing helpers See merge request !1600
| * | Add explanation to routing methodDmitriy Zaporozhets2015-02-251-0/+13
| | |
| * | Introduce shortcuts for routing helpersDmitriy Zaporozhets2015-02-252-2/+20
| |/
* | Merge branch 'event_tooltip_addition' into 'master'Marin Jankovski2015-02-261-1/+1
|\ \ | |/ |/| | | | | | | | | | | Added information to tooltips Tooltips now have meaning by mentioning their function ("Filter by..."). Fixes #1992 See merge request !1571
| * Added information to tooltipsSabba Petri2015-02-231-1/+1
| | | | | | | | Tooltips now have meaning by mentioning their function ("Filter by..."). Fixes #1992
* | Merge branch 'bitbucket-import'Dmitriy Zaporozhets2015-02-252-10/+4
|\ \ | | | | | | | | | | | | | | | Conflicts: app/views/import/gitorious/status.html.haml db/schema.rb
| * | Load public key in initializer.Douwe Maan2015-02-242-12/+2
| | |
| * | Add Bitbucket importer.Douwe Maan2015-02-242-2/+6
| |/
* | Get rid of black logoDmitriy Zaporozhets2015-02-241-5/+1
| |
* | Refactor header logo and setup expectation on it sizeDmitriy Zaporozhets2015-02-241-0/+8
|/
* Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-195-27/+49
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/dashboard/_project.html.haml app/views/events/event/_common.html.haml app/views/explore/projects/_project.html.haml app/views/groups/_projects.html.haml app/views/projects/_home_panel.html.haml app/views/projects/_issues_nav.html.haml app/views/projects/issues/_discussion.html.haml app/views/projects/issues/_issues.html.haml app/views/projects/issues/show.html.haml app/views/projects/merge_requests/_discussion.html.haml app/views/projects/merge_requests/_show.html.haml app/views/projects/milestones/index.html.haml app/views/projects/notes/_edit_form.html.haml app/views/shared/_issuable_filter.html.haml
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-02-181-1/+1
| |\