summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | entities: expose {,merge_commit_}sha in MergeRequestBen Boeckel2016-08-314-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #20456.
* | | | | | | | | | | | | | | | | | Merge branch 'js-tooltips-for-mentions' into 'master' Robert Speicher2016-09-0119-56/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use JavaScript tooltips for mentions ## What does this MR do? - use JavaScript tooltips instead of plain title for mentions (issue, merge request, snippet, user, group, commit, commit range, milestone) ## Why was this MR needed? JavaScript tooltips look nicer and can wrap. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5261#note_13106713, fixes #21500 See merge request !5301
| * | | | | | | | | | | | | | | | | | Use JavaScript tooltips for mentions (!5301)winniehell2016-09-0119-56/+28
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '20601-emoji-tooltip-in-chronological-order' into 'master' Robert Speicher2016-09-013-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Order award tooltips by their created_at date ## What are the relevant issue numbers? Closes #20601 See merge request !6086
| * | | | | | | | | | | | | | | | | | Order award tooltips by their created_at dateAndrew Smith2016-09-013-1/+12
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'fix-suggested-colors-options-for-new-labels-in-the-admin-area' ↵Fatih Acet2016-09-012-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix suggested colors options for new labels in the admin area ## What does this MR do? Execute the JS related to the suggested colors options when user access the new label in the admin area. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Clicking in a suggested color when creating a new label in the admin area don't change the background color. ## Screenshots (if relevant) * Before ![2016-08-31_19.56.14](/uploads/3d50236dac578910c5062aa1e83da350/2016-08-31_19.56.14.gif) * After ![2016-08-31_19.58.59](/uploads/376ffdcbb5b80ef51ab1d642fe9486d0/2016-08-31_19.58.59.gif) ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21726 See merge request !6138
| * | | | | | | | | | | | | | | | | | Update CHANGELOGfix-suggested-colors-options-for-new-labels-in-the-admin-areaDouglas Barbosa Alexandre2016-08-311-0/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix suggested colors options for new labels in the admin areaDouglas Barbosa Alexandre2016-08-311-0/+1
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'expire-commit-info-partials-sooner' into 'master' Yorick Peterse2016-09-012-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expire commit view partial after a day See merge request !6128
| * | | | | | | | | | | | | | | | | | Expire commit view partial after a dayexpire-commit-info-partials-soonerSean McGivern2016-08-312-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We rarely use Russian-doll caching in views, and when we do, it's typically with a naturally-invalidating key. In the case of the commit partial, though, the author lookup isn't part of the cache key - because we're not going to use the state of the users table - and so a new email address can take up to two weeks to show against the commits list. Limiting this to a day still caches the partial for a healthy amount of time, without as bad a worst case scenario.
* | | | | | | | | | | | | | | | | | | Merge branch 'meta/add-doc-mr-template' into 'master' Achilleas Pipinellis2016-09-011-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add MR Documentation description template Add an MR Documentation template for `gitlab-ce`. See merge request !6145
| * | | | | | | | | | | | | | | | | | Add MR Documentation description templateAchilleas Pipinellis2016-09-011-0/+14
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'control-dropdown-permissions' into 'master' Robert Speicher2016-08-312-18/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide group control nav if no options present ## What does this MR do? Hides the group nav controls if no options present in the dropdown. Also fixed the alignment of the dropdown to match the project page. ## What are the relevant issue numbers? Closes #19120 See merge request !5155
| * | | | | | | | | | | | | | | | | Updated variable namecontrol-dropdown-permissionsPhil Hughes2016-08-301-3/+3
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Hide group control nav if no options presentPhil Hughes2016-08-302-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #19120
* | | | | | | | | | | | | | | | | | Merge branch ↵Robert Speicher2016-08-313-15/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'gh-importer-use-default-project-visibility-for-non-private-projects' into 'master' GitHub importer use default project visibility for non-private projects ## What does this MR do? GitHub importer use the `Default Project Visibility` setting for all non-private projects. ## Why was this MR needed? This allow users to import projects when `Public` visibility is restricted. ## What are the relevant issue numbers? Fixes #21437 See merge request !6023
| * | | | | | | | | | | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-08-311-0/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | GitHub importer use default project visibility for non-private projectsDouglas Barbosa Alexandre2016-08-312-15/+41
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'refactor/add-policies' into 'master' Robert Speicher2016-08-3145-824/+690
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor ability.rb into Policies ## What does this MR do? Factors out `ability.rb` into a new abstraction - the "policy" (stored in `app/policies`). A policy is a class named `#{class_name}Policy` (looked up automatically as needed) that implements `rules` as follows: ``` ruby class ThingPolicy < BasePolicy def rules @user # this is a user to determine abilities for, optionally nil in the anonymous case @subject # this is the subject of the ability, guaranteed to be an instance of `Thing` can! :some_ability # grant the :some_ability permission cannot! :some_ability # ensure that :some_ability is not allowed. this overrides any `can!` that is called before or after delegate! @subject.other_thing # merge the abilities (can!) and prohibitions (cannot!) from `@subject.other_thing` can? :some_ability # test whether, so far, :some_ability is allowed end def anonymous_rules # optional. if not implemented `rules` is called where `@user` is nil. otherwise this method is called when `@user` is nil. end end ``` See merge request !5796
| * | | | | | | | | | | | | | | | newline before default returnrefactor/add-policieshttp://jneen.net/2016-08-301-0/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | s/NB:/NOTE:/http://jneen.net/2016-08-302-2/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | don't use a deprecated api in ability_spechttp://jneen.net/2016-08-301-2/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | implement RuleSet#size for testshttp://jneen.net/2016-08-301-0/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | line break after guard clausehttp://jneen.net/2016-08-301-0/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | use || in place of `or`http://jneen.net/2016-08-301-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | use a more compact style for access policieshttp://jneen.net/2016-08-301-11/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | move the rules method to the top #cosmetichttp://jneen.net/2016-08-301-27/+27
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | factor out a RuleSet so that `delegate!` retains @cannothttp://jneen.net/2016-08-302-9/+51
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | remove the rest of the dead codehttp://jneen.net/2016-08-301-74/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | special-case blocked usershttp://jneen.net/2016-08-301-0/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | test if we can :read_group the group, not the namespacehttp://jneen.net/2016-08-301-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | use a nil subject when we want to check global abilitieshttp://jneen.net/2016-08-302-2/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | add Deployment, Environment, and ExternalIssue policieshttp://jneen.net/2016-08-303-0/+15
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | take the dive - only use abilities from Policieshttp://jneen.net/2016-08-301-8/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | use the cached abilities in #delegate!http://jneen.net/2016-08-301-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | port UserPolicyhttp://jneen.net/2016-08-302-11/+11
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | port runners, namespaces, group/project_membershttp://jneen.net/2016-08-304-58/+42
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | add personal snippets and project membershttp://jneen.net/2016-08-302-0/+38
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | factor in global permissionshttp://jneen.net/2016-08-302-2/+9
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | trim more dead codehttp://jneen.net/2016-08-301-52/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | port groupshttp://jneen.net/2016-08-302-36/+48
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | port personal snippetshttp://jneen.net/2016-08-301-32/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | trim dead codehttp://jneen.net/2016-08-301-81/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | port notes and project snippetshttp://jneen.net/2016-08-302-0/+39
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | add automatic detection of the policy classhttp://jneen.net/2016-08-302-16/+18
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | port CommitStatus/Buildhttp://jneen.net/2016-08-304-1/+24
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | add and use MergeRequestPolicyhttp://jneen.net/2016-08-302-2/+8
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | port issues to Issu{able,e}Policyhttp://jneen.net/2016-08-305-4/+58
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | add support for anonymous abilitieshttp://jneen.net/2016-08-303-205/+67
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | add project_policy_spec to replace .project_abilities spechttp://jneen.net/2016-08-302-64/+36
| | | | | | | | | | | | | | | | |