summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '37202-revert-changes-to-signing-enabled' into 'master'Douwe Maan2017-09-011-1/+1
|\ | | | | | | | | | | | | Rollback changes made to signing_enabled. Closes #37202 See merge request !13956
| * Rollsback changes made to signing_enabled.Tiago Botelho2017-09-011-1/+1
| |
* | Merge branch 'sm-cherry-pick-list-commits-in-message' into 'master'Sean McGivern2017-09-012-1/+23
|\ \ | | | | | | | | | | | | Add 'from commit' information to cherry-picked commits See merge request !13475
| * | Change a variable name in Commit#cherry_pick_descriptionSaverio Miroddi2017-08-211-4/+4
| | |
| * | Reverse order of commits in MR cherry-pick messageSaverio Miroddi2017-08-211-1/+1
| | | | | | | | | | | | Also improved the UT for better documenting this change.
| * | Correct the cherry-pick message for merge commitsSaverio Miroddi2017-08-172-13/+8
| | | | | | | | | | | | | | | The list of commits must be generated from the merge request, not from a diff of the branches.
| * | Add support for start project to commit cherry-pick descriptionSaverio Miroddi2017-08-152-5/+5
| | |
| * | Made commit cherry-pick message more standardSaverio Miroddi2017-08-151-11/+8
| | | | | | | | | | | | | | | | | | Follow the `cherry pick -x` format for the first line, and the interactive rebase format for the commits in the merge, in case of merge commit
| * | Extracted cherry-pick description in ::CommitSaverio Miroddi2017-08-151-6/+10
| | | | | | | | | | | | This also fixes the inconsistency between non/merge commits in the number of newlines introduced.
| * | Merge branch 'master' into sm-cherry-pick-list-commits-in-messageSaverio Miroddi2017-08-1518-35/+468
| |\ \
| * | | Add 'from commit' information to cherry-picked commitsSaverio Miroddi2017-08-102-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | Store the original commit in the commit message. In case of merge commit, the commits added to the start branch are also listed.
* | | | Merge branch '35686-unescape-wiki-title' into 'master'Sean McGivern2017-09-011-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unescape HTML characters in Wiki title Closes #35686 See merge request !13942
| * | | | Unescape HTML characters in Wiki titleJacopo2017-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | The special characters of a wiki title are now escaped correctly.
* | | | | Merge branch 'issue_36820' into 'master'Sean McGivern2017-09-011-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove closing external issues by reference error Closes #36820 See merge request !13910
| * | | | | Remove closing external issues by reference errorissue_36820Felipe Artur2017-08-311-0/+2
| | | | | |
* | | | | | Merge branch ↵Tim Zallmann2017-08-311-8/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31273-creating-an-project-within-an-internal-sub-group-gives-the-option-to-set-it-a-public' into 'master' Resolve various visibility level settings issues Closes #31273 See merge request !13442
| * | | | | | revert changes to visibility level helpers from 6f03ddcMike Greiling2017-08-302-7/+5
| | | | | | |
| * | | | | | Address some suggestions from first code reviewRubén Dávila2017-08-292-22/+24
| | | | | | |
| * | | | | | prefer !x.exists? instead of x.none? to prevent unnecessary instantiation of ↵Mike Greiling2017-08-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | records
| * | | | | | Fix broken spec.Rubén Dávila2017-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | parent_id is being set to 0 by RSpec.
| * | | | | | recognize instances where group visibility levels are unavailableMike Greiling2017-08-261-0/+6
| | | | | | |
| * | | | | | separate visibility_level_allowed logic from model validatorsMike Greiling2017-08-261-15/+17
| | | | | | |
| * | | | | | Add validation to check visibility level of sub groups.Rubén Dávila2017-08-261-4/+16
| | | | | | |
| * | | | | | Add validation for visibility level of sub groupsRubén Dávila2017-08-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sub groups should not have a visibility level higher than its parent.
* | | | | | | Merge branch ↵Douwe Maan2017-08-315-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37266-nomethoderror-undefined-method-current_application_settings-build-failed-30837482' into 'master' `current_application_settings` belongs on `Gitlab::CurrentSettings` Closes #37266 See merge request !13955
| * | | | | | | `current_application_settings` belongs on `Gitlab::CurrentSettings`Sean McGivern2017-08-315-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
* | | | | | | | Merge branch 'sidebar-cache-updates' into 'master'Sean McGivern2017-08-312-0/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only update the sidebar count caches when needed See merge request !13878
| * | | | | | | | Only update the sidebar count caches when neededsidebar-cache-updatesYorick Peterse2017-08-302-0/+12
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures the issues/MR cache of the sidebar is only updated when the state or confidential flags changes, instead of changing this for every update.
* | | | | | | | Merge branch 'zj-disable-pages-in-subgroups' into 'master'Grzegorz Bizon2017-08-312-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show references to Pages when not available Closes #34864 See merge request !13888
| * | | | | | | | Don't show references to Pages when not availableZeger-Jan van de Weg2017-08-312-0/+8
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this instance its subgroups, and given we can't deploy it, we shouldn't allow it to be shown. Fixes gitlab-org/gitlab-ce#34864
* | | | | | | | Merge branch 'gitaly-440-shell-fetch-remote' into 'master'Sean McGivern2017-08-311-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Repository.FetchRemote to Gitaly See merge request !13625
| * | | | | | | | Migrate Repository.FetchRemote to Gitalygitaly-440-shell-fetch-remoteKim "BKC" Carlbäcker2017-08-301-1/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | - `Gitlab::Shell.fetch_remote` now takes a `Gitlab::Git::Repository` instead
* | | | | | | | Merge branch '26692-predefined-variable-gitlab-user-name' into 'master'Grzegorz Bizon2017-08-311-1/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Predefined Variable GITLAB_USER_NAME" Closes #26692 See merge request !13824
| * | | | | | | Add a Build Variable to represent the triggering GitLab user's login usernameMark Fletcher2017-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Predefined variable represents the username of the GitLab user that started a build
| * | | | | | | Add a Build Variable to represent the triggering GitLab user's nameMark Fletcher2017-08-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Predefined variable represents the name of the GitLab user that started a build
* | | | | | | | Use `git update-ref --stdin -z` to delete refs36807-gc-unwanted-refs-after-importLin Jen-Shin2017-08-301-1/+1
| | | | | | | |
* | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-08-3022-84/+153
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36807-gc-unwanted-refs-after-import * upstream/master: (225 commits) Add changelog entry Backports EE 2756 logic to CE. Make rubocop happy Make profile settings dropdown consistent Add filter by my reaction Update spec initialization with it being a shared component Update identicon path and selector Renamed to `identicon` and make shared component Merge branch 'master-i18n' into 'master' Fix broken Frontend JS guide Replace 'project/star.feature' spinach test with an rspec analog Adds position fixed to right sidebar Fixes the margin of the top buttons of the pipeline page Remove commented out code Better align fallback image emojis Decrease Metrics/CyclomaticComplexity threshold to 15 Add changelog Respect the default visibility level when creating a group Further break with_repo_branch_commit into parts Make sure inspect doesn't generate crazy string ...
| * | | | | | | Merge branch 'perf.slow-issuable' into 'master'Sean McGivern2017-08-301-16/+33
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perf.slow issuable Closes #32844 See merge request !13685
| | * | | | | | | Further break with_repo_branch_commit into partsperf.slow-issuableLin Jen-Shin2017-08-291-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So it's more clear what could happen. Also add more tests about the behaviour.
| | * | | | | | | Make sure inspect doesn't generate crazy stringLin Jen-Shin2017-08-291-0/+4
| | | | | | | | |
| | * | | | | | | It doesn't seem that rubocop is complaining for meLin Jen-Shin2017-08-291-3/+1
| | | | | | | | |
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into perf.slow-issuableLin Jen-Shin2017-08-2916-148/+315
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (206 commits) Resolve "Monitoring graph date formatting is wrong" Add styles for shorter code Update doc for dind using overlay2 Cleans merge_jid when possible on MergeService Rename MergeRequest#async_merge to merge_async Add changelog Track enqueued and ongoing MRs Remove locked? check when unlocking a merge request Update CHANGELOG.md for 9.5.2 Update rubocop-gitlab-security to 0.1.0 Fix spec Fix changelog Fix spec Add changelog Remove trigger_request.trigger.owner Reproduced bug Fix a transient failure in mini_pipeline_graph_spec fix typo fix spec Fix events error importing GitLab projects ...
| | * | | | | | | skip the branch fetch if we already have the shahttp://jneen.net/2017-08-211-12/+16
| | | | | | | | |
| | * | | | | | | implement Repository#==http://jneen.net/2017-08-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that with_repo_branch_commit can properly short-circuit
| * | | | | | | | Merge branch 'improve-autocomplete-user-performance' into 'master'Yorick Peterse2017-08-301-1/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve AutocompleteController#users.json performance Closes #36879 See merge request !13754
| | * | | | | | | | Move the logic to a concernHiroyuki Sato2017-08-291-1/+2
| | | | | | | | | |
| | * | | | | | | | Improve AutocompleteController#user.json performanceHiroyuki Sato2017-08-251-1/+1
| | |/ / / / / / /
| * | | | | | | | Add filter by my reactionHiroyuki Sato2017-08-301-0/+15
| | | | | | | | |
| * | | | | | | | Merge branch '35793_fix_predicate_names' into 'master'Robert Speicher2017-08-2911-23/+23
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Remove `is_` prefix from predicate method names See merge request !13810
| | * | | | | | | replace `is_dashboard_milestone?` with `dashboard_milestone?`Maxim Rydkin2017-08-292-2/+2
| | | | | | | | |
View Lorry Controller Status