Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '43246-checkfilter' into 'master' | Sean McGivern | 2018-04-06 | 1 | -25/+4 |
|\ | | | | | | | | | | | | | Resolve "Show a message when loading the issues / merge requests dashboard without filters" Closes #43246 See merge request gitlab-org/gitlab-ce!17961 | ||||
| * | Fixed dashboard filtering tests | Jan Provaznik | 2018-04-03 | 1 | -25/+4 |
| | | |||||
* | | Merge branch '42028-xss-diffs-10-6' into 'security-10-6' | Douwe Maan | 2018-04-05 | 1 | -2/+28 |
| | | | | | | | | | | Port of "Fix XSS on commit diff view" for 10-6 See merge request gitlab/gitlabhq!2364 | ||||
* | | Fix links to subdirectories of a directory with a plus character in its pathdm-flatten-tree-plus-chars | Douwe Maan | 2018-04-04 | 1 | -0/+10 |
|/ | |||||
* | Merge branch 'add-canary-favicon' into 'master' | Sean McGivern | 2018-03-29 | 1 | -0/+5 |
|\ | | | | | | | | | Add canary favicon See merge request gitlab-org/gitlab-ce!12477 | ||||
| * | Update styling and use Gitlab::Utils.to_boolean | Eric Eastwood | 2018-03-27 | 1 | -0/+5 |
| | | |||||
* | | 'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choices | Elias Werberich | 2018-03-27 | 1 | -1/+3 |
|/ | |||||
* | Fix import helper spec when a previous spec stubs settings | Sean McGivern | 2018-03-15 | 1 | -4/+2 |
| | | | | This should use stub_omniauth_setting, not do it manually. | ||||
* | Merge branch 'rd-fix-github-url-when-listing-repositories-at-importing' into ↵ | Douwe Maan | 2018-03-12 | 1 | -5/+28 |
|\ | | | | | | | | | | | | | 'master' Fix provider server URL used when listing repos to import See merge request gitlab-org/gitlab-ce!17692 | ||||
| * | Fix provider server URL used when listing repos to importrd-fix-github-url-when-listing-repositories-at-importing | Rubén Dávila | 2018-03-12 | 1 | -5/+28 |
| | | | | | | | | Also use Gitlab::Auth::OAuth::Provider.config_for to access OmniAuth config | ||||
* | | Add helpers for labels dropdown | Kushal Pandya | 2018-03-12 | 1 | -0/+72 |
|/ | |||||
* | Allow maintainers to edit directly in a fork | Bob Van Landuyt | 2018-03-07 | 1 | -0/+9 |
| | |||||
* | Merge branch 'master' into 'issue_38337' | Felipe Artur | 2018-03-06 | 2 | -7/+7 |
|\ | | | | | | | | | # Conflicts: # app/models/group.rb # db/schema.rb | ||||
| * | Replace deprecated name_with_namespace with full_name in app and spec | Dmitriy Zaporozhets | 2018-03-05 | 2 | -7/+7 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Bring one group board to CE | Felipe Artur | 2018-03-03 | 1 | -0/+28 |
|/ | |||||
* | Remove u2f webpack bundle | Mike Greiling | 2018-03-01 | 1 | -49/+0 |
| | |||||
* | Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into ↵ | Douwe Maan | 2018-02-26 | 1 | -4/+4 |
|\ | | | | | | | | | | | | | | | | | 'master' Resolve "Refactoring of blob link methods in blob_helper" Closes #41255 See merge request gitlab-org/gitlab-ce!16851 | ||||
| * | refactor methods inline41255-refactoring-of-blob-link-methods-in-blob_helper | James Lopez | 2018-02-23 | 1 | -1/+1 |
| | | |||||
| * | refactor code based on feedback | James Lopez | 2018-02-23 | 1 | -4/+4 |
| | | |||||
| * | some initial refactoring | James Lopez | 2018-02-23 | 1 | -5/+5 |
| | | |||||
* | | Don't convert issuable_initial_data into JSONjprovazn-issuable-data | Jan Provaznik | 2018-02-26 | 1 | -16/+16 |
|/ | | | | | | | | | | Instead of converting hash into JSON inside issuable_initial_data method, return hash and convert to JSON later. This allows us to easily extend basic issuable data with resource specific values. For example for Epic these data should include also labels, so we can then do something like: issuable_initial_data(@epic).merge(labels: @epic.labels).to_json | ||||
* | Merge branch 'bvl-external-auth-port' into 'master' | Douwe Maan | 2018-02-23 | 7 | -15/+153 |
|\ | | | | | | | | | Port `read_cross_project` ability from EE See merge request gitlab-org/gitlab-ce!17208 | ||||
| * | Port `read_cross_project` ability from EE | Bob Van Landuyt | 2018-02-22 | 7 | -15/+153 |
| | | |||||
* | | Add Tip about Push to Create project on New Project page | André Luís | 2018-02-23 | 1 | -0/+16 |
| | | |||||
* | | Merge branch 'master' into 42431-add-auto-devops-and-clusters-button-to-projects | Eric Eastwood | 2018-02-22 | 4 | -14/+54 |
|\ \ | |/ | |||||
| * | Escape HTML entities in commit messages | Douwe Maan | 2018-02-15 | 1 | -0/+4 |
| | | |||||
| * | Extract repeated logic into #avatar_icon_for.42800-change-usage-of-avatar_icon | Andreas Brandl | 2018-02-13 | 1 | -0/+16 |
| | | | | | | | | | | | | This essentially allows to pass both user and email, so that we can either prefer the user to retrieve the avatar or (if user is not present) fall back to the email lookup. | ||||
| * | Remove generic #avatar_icon helper. | Andreas Brandl | 2018-02-13 | 1 | -28/+0 |
| | | |||||
| * | Explicit use of avatar_icon_* calls depending on situation. | Andreas Brandl | 2018-02-13 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | We want to drop the generic #avatar_icon helper that supports both an email and a user object being passed in. Instead, we want to explicitly use the #avatar_icon_for_user and #avatar_icon_for_email helpers depending on what we have at hand. This allows us to avoid unnecessary database queries (e.g. call User.find_by_any_email if we already have the user). In situations like here, this makes it less convenient to use. | ||||
| * | Use more specific #avatar_icon_for_user. | Andreas Brandl | 2018-02-13 | 1 | -1/+1 |
| | | | | | | | | | | Whenever we already deal with a User object, let's use the more specific method avatar_icon_for_user. | ||||
| * | Refactor and split ApplicationHelper#avatar_icon. | Andreas Brandl | 2018-02-13 | 1 | -0/+48 |
| | | | | | | | | | | | | | | When we don't use the original `ApplicationHelper#avatar_icon` anymore, we can just remove it (and its specs). Closes #42800. | ||||
* | | Move default_project_view tests to presenter | Oswaldo Ferreira | 2018-02-20 | 1 | -97/+0 |
| | | |||||
* | | Move button list logic to project presenter | Oswaldo Ferreira | 2018-02-20 | 1 | -26/+0 |
|/ | |||||
* | Merge branch 'zj-refs-hash' into 'master' | Sean McGivern | 2018-02-07 | 1 | -3/+3 |
|\ | | | | | | | | | | | | | Don't use rugged in Repository#refs_hash Closes gitaly#880 See merge request gitlab-org/gitlab-ce!16827 | ||||
| * | Don't use rugged in Repository#refs_hash | Zeger-Jan van de Weg | 2018-02-07 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refs hash is used to determine what branches and tags have a commit as head in the network graph. The previous implementation depended on Rugged#references. The problem with this implementation was that it depended on rugged, but also that it iterated over all references and thus loading more data than needed if for example the project uses CI/CD environments, Pipelines, or Merge Requests. Given only refs are checked the network cares about the GraphHelper#refs method has no need to reject those, simplifying the method. Closes gitlab-org/gitaly#880 | ||||
* | | Merge branch '38175-add-domain-field-to-auto-devops-application-setting' ↵ | Kamil Trzciński | 2018-02-07 | 1 | -0/+35 |
|\ \ | |/ |/| | | | | | | | | | | | | | into 'master' Resolve "Add domain field to Auto DevOps application setting" Closes #38175 See merge request gitlab-org/gitlab-ce!16604 | ||||
| * | Merge branch 'master' into ↵ | Matija Čupić | 2018-02-02 | 1 | -2/+2 |
| |\ | | | | | | | | | | 38175-add-domain-field-to-auto-devops-application-setting | ||||
| * \ | Merge branch 'master' into ↵ | Matija Čupić | 2018-02-02 | 4 | -6/+6 |
| |\ \ | | | | | | | | | | | | | 38175-add-domain-field-to-auto-devops-application-setting | ||||
| * | | | Rename AutoDevopsHelper helper methods | Matija Čupić | 2018-02-02 | 1 | -5/+5 |
| | | | | |||||
| * | | | Add specs for .auto_devops_warning_message | Matija Čupić | 2018-02-01 | 1 | -0/+35 |
| | | | | |||||
* | | | | Refactor .show_gke_cluster_integration_callout? | Matija Čupić | 2018-02-05 | 1 | -18/+10 |
| | | | | |||||
* | | | | Merge branch 'master' into persistent-callouts | Matija Čupić | 2018-02-02 | 4 | -8/+8 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | use Gitlab::UserSettings directly as a singleton instead of ↵ | Mario de la Ossa | 2018-02-02 | 1 | -2/+2 |
| | |/ | |/| | | | | | | | including/extending it | ||||
| * | | Enable RuboCop Style/RegexpLiteral | Takuya Noguchi | 2018-02-01 | 3 | -4/+4 |
| | | | |||||
| * | | Make default_avatar return a full path. | Felix Geyer | 2018-01-28 | 1 | -2/+2 |
| |/ | | | | | | | | | | | | | | | | | Callers expect a URL. This fixes the avatars in commit lists when a user has no avatar and Gravatar is disabled. Closes #38715 | ||||
* | | Rename Callout to UserCallout | Matija Čupić | 2018-02-02 | 1 | -1/+1 |
| | | |||||
* | | Use policies instead of role checks in ClustersHelper | Matija Čupić | 2018-02-02 | 1 | -16/+8 |
| | | |||||
* | | Fix CalloutsHelper spec subject | Matija Čupić | 2018-01-30 | 1 | -1/+1 |
| | | |||||
* | | Show GKE cluster callout for project owner as well | Matija Čupić | 2018-01-30 | 1 | -3/+13 |
| | | |||||
* | | Add check for guest user | Matija Čupić | 2018-01-30 | 1 | -0/+8 |
| | |