Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into 'issue_38337' | Felipe Artur | 2018-03-06 | 1 | -1/+53 |
|\ | | | | | | | | | # Conflicts: # app/models/group.rb # db/schema.rb | ||||
| * | Projects and groups badges API | Francisco Javier López | 2018-03-05 | 1 | -1/+53 |
| | | |||||
* | | Bring one group board to CE | Felipe Artur | 2018-03-03 | 1 | -1/+1 |
|/ | |||||
* | Port `read_cross_project` ability from EE | Bob Van Landuyt | 2018-02-22 | 1 | -0/+1 |
| | |||||
* | Hide pipeline schedule 'take ownership' for current owner | Mark Fletcher | 2018-02-01 | 1 | -0/+47 |
| | |||||
* | Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service" | Fabio Busatto | 2018-01-25 | 1 | -4/+4 |
| | |||||
* | Merge branch '39988-hide-new-branch-tag-empty-repo' into 'master' | Rémy Coutable | 2018-01-11 | 1 | -0/+39 |
|\ | | | | | | | | | | | | | Resolve ""New branch" and "New tag" actions are pointless on an empty repository" Closes #39988 See merge request gitlab-org/gitlab-ce!16332 | ||||
| * | Hide new branch and tag links for projects with an empty repo | Mark Fletcher | 2018-01-09 | 1 | -0/+39 |
| | | |||||
* | | Backport 'Rebase' feature from EE to CEjprovazn-rebase | Jan Provaznik | 2018-01-05 | 1 | -0/+2 |
|/ | | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301 | ||||
* | Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specs | blackst0ne | 2017-12-22 | 2 | -2/+2 |
| | |||||
* | Fix tags in the Activity tab not being clickable | Mario de la Ossa | 2017-12-19 | 1 | -0/+55 |
| | |||||
* | Merge branch 'rc/use-factory_bot_rails' into 'master' | Robert Speicher | 2017-12-15 | 1 | -2/+2 |
|\ | | | | | | | | | Replace factory_girl_rails with factory_bot_rails See merge request gitlab-org/gitlab-ce!15919 | ||||
| * | Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_rails | Rémy Coutable | 2017-12-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md) and ran these two commands: ``` grep -e FactoryGirl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|" grep -e factory_girl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|factory_girl|factory_bot|" ``` Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | spec fixes | Phil Hughes | 2017-12-14 | 2 | -3/+3 |
| | | |||||
* | | added specs | Phil Hughes | 2017-12-12 | 1 | -0/+40 |
| | | |||||
* | | fixed failing tests | Phil Hughes | 2017-12-11 | 1 | -0/+1 |
|/ | |||||
* | adding view and feature specs | micael.bergeron | 2017-12-07 | 3 | -5/+57 |
| | |||||
* | Fixes admin welcome states new group pathadmin-welcome-new-group-link | Phil Hughes | 2017-12-06 | 1 | -0/+15 |
| | | | | Closes #40645 | ||||
* | Fix integraetion tests | Shinya Maeda | 2017-11-28 | 1 | -1/+1 |
| | |||||
* | Prevent 500 error when inspecting job after trigger was removed | Filipa Lacerda | 2017-11-24 | 1 | -0/+25 |
| | |||||
* | Merge branch '37824-many-branches-lock-server' into 'master' | Annabel Dunstone Gray | 2017-11-07 | 1 | -0/+109 |
|\ | | | | | | | | | | | | | Project with many branches can lock server running "git branch --contains XXX" Closes #37824 See merge request gitlab-org/gitlab-ce!14812 | ||||
| * | Addresses front & backend comments | Mayra Cabrera | 2017-11-06 | 1 | -1/+1 |
| | | | | | | | | | | - Improves CSS files by reusing existing code - Changes logic in views to avoid future problems in translations | ||||
| * | Modifies commit branches section | Mayra Cabrera | 2017-11-06 | 1 | -3/+70 |
| | | | | | | | | | | | | - Display the default branch (if the limit is not exceeded) - Requires '...' to be clicked before showing the rest of the branches and/or tags - Fixes haml lints | ||||
| * | Add styles for branch & tags boxes | Mayra Cabrera | 2017-11-02 | 1 | -4/+2 |
| | | | | | | | | | | - Create a partial for limit exceeded message - Modifies specs to adjust new scenarios | ||||
| * | implemented using an ivar, and added specs | Brett Walker | 2017-10-13 | 1 | -0/+44 |
| | | |||||
* | | Load participants async | Eric Eastwood | 2017-10-31 | 1 | -26/+0 |
| | | |||||
* | | Added ssh fingerprint, gitlab ci and pages information in an instance ↵ | Francisco Lopez | 2017-10-25 | 2 | -0/+37 |
|/ | | | | | | configuration page Closes #25142 | ||||
* | Add a project forks spec helper | Bob Van Landuyt | 2017-10-07 | 3 | -10/+15 |
| | | | | | The helper creates a fork of a project with all provided attributes, but skipping the creation of the repository on disk. | ||||
* | Merge branch '31050-registry-image-lists' into 'master' | Grzegorz Bizon | 2017-10-04 | 1 | -36/+0 |
|\ | | | | | | | | | | | | | Lazy load and paginate registry image list Closes #31050 See merge request gitlab-org/gitlab-ce!14303 | ||||
| * | Add serializer matchers | Kamil Trzcinski | 2017-10-02 | 1 | -36/+0 |
| | | |||||
* | | use LazyImageTagHelper.placeholder_image for blank src base64 image34366-issue-sidebar-don-t-render-participants-in-collapsed-state | Luke "Jared" Bennett | 2017-10-01 | 1 | -1/+1 |
| | | |||||
* | | Finish _participants view spec | Luke "Jared" Bennett | 2017-09-28 | 1 | -22/+7 |
| | | |||||
* | | Add participants spec | Luke "Jared" Bennett | 2017-09-28 | 1 | -0/+41 |
|/ | |||||
* | Add context tabs to dashboard/projects | Phil Hughes | 2017-09-22 | 1 | -0/+17 |
| | | | | | | | | | This allows users to quickly switch between all projects they have access to & there own namespace projects. These tabs also keep the same filtering/search options selected so the user can quickly switch between the two different contexts. Closes #29045 | ||||
* | Add specs for warning message shown in Auto DevOps settings37894-handle-if-auto-devops-domain-is-not-set | Kamil Trzcinski | 2017-09-19 | 1 | -0/+62 |
| | |||||
* | Fixes milestone issuable assignee URLmilestone-avatar-issuable-link | Phil Hughes | 2017-09-15 | 1 | -0/+19 |
| | | | | Closes #33124 | ||||
* | CE backport of new-sidebar-boardsce-backport-new-sidebar-boards | Phil Hughes | 2017-09-13 | 1 | -6/+18 |
| | |||||
* | move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb` | Maxim Rydkin | 2017-09-12 | 1 | -2/+2 |
| | |||||
* | Merge branch 'improve-share-locking-feature-for-subgroups' into 'master' | Douwe Maan | 2017-09-07 | 1 | -0/+116 |
|\ | | | | | | | | | | | | | Improve "Share with group lock" feature for subgroups Closes #30550 See merge request !13944 | ||||
| * | Refer to “Share with group lock” consistentlyimprove-share-locking-feature-for-subgroups | Michael Kozono | 2017-09-06 | 1 | -17/+17 |
| | | |||||
| * | Fix “Share lock” help text | Michael Kozono | 2017-09-06 | 1 | -29/+5 |
| | | |||||
| * | Vary share lock setting UI | Michael Kozono | 2017-09-06 | 1 | -0/+140 |
| | | | | | | | | …based on whether the current user owns the parent group and whether the parent group or current group is share locked. | ||||
* | | Resolve "Make project and features visibility settings less confusing" | Mike Greiling | 2017-09-07 | 1 | -11/+0 |
|/ | |||||
* | Clean up new navigation templates | Phil Hughes | 2017-09-06 | 1 | -2/+4 |
| | |||||
* | Merge branch ↵ | Kamil Trzciński | 2017-09-05 | 1 | -16/+0 |
|\ | | | | | | | | | | | | | | | | | 'fix/sm/35650-remove-createtriggerrequestservice-and-forbid-to-persist-variables-on-ci-triggerrequest' into 'master' Removes `CreateTriggerRequestService` and add a blocker to prevent saving variables on `Ci::TriggerRequest` Closes #35650 See merge request !13792 | ||||
| * | Remove ci_trigger_request_with_variables | Shinya Maeda | 2017-09-04 | 1 | -16/+0 |
| | | |||||
| * | Fix spec | Shinya Maeda | 2017-09-04 | 1 | -1/+1 |
| | | |||||
| * | Revert autheticate! in Trigger API | Shinya Maeda | 2017-09-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into feature/gb/kubernetes-only-pipeline-jobs | Grzegorz Bizon | 2017-09-04 | 10 | -2/+23 |
|\ \ | |/ | | | | | * master: (469 commits) | ||||
| * | `current_application_settings` belongs on `Gitlab::CurrentSettings` | Sean McGivern | 2017-08-31 | 10 | -2/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. |