summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make usage of SSH keys in CI/CD more cleardocs/ci-ssh-keysAchilleas Pipinellis2017-12-133-87/+177
|
* Merge branch '40468-empty-states' into 'master'Tim Zallmann2017-12-1310-53/+72
|\ | | | | | | | | | | | | Resolve "Update styling of empty states" Closes #40468 See merge request gitlab-org/gitlab-ce!15791
| * Adds i18n40468-empty-statesFilipa Lacerda2017-12-125-19/+20
| |
| * Center cluster titleFilipa Lacerda2017-12-121-1/+1
| |
| * Merge branch 'master' into 40468-empty-statesFilipa Lacerda2017-12-12187-912/+1588
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (54 commits) Updated image for diff navigation docs Milestone sidebar docs Use app host instead of asset host when rendering image blob or diff ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build Use shared interceptor in note specs Ignore temporary table in schema Check for null in job tooltip title Clarify casing of I18N placeholder names fixes some markup issues in the js style guide docs Fix migration that removes issues.branch_name small change to make less conflict with EE version Add cop for use of remove_column Resolve merge conflicts with dev.gitlab.org/master after security release add index for doc/administration/operations/ Remove RubySampler#sample_objects for performance as well Bugfix: User can't change the access level of an access requester Add spec for removing issues.assignee_id updated imports Keep track of storage check timings Remove a header level in the new 'Automatic CE->EE merge' doc ...
| * | Fix broken testFilipa Lacerda2017-12-111-1/+1
| | |
| * | Improve empty states for TODOs and issuesFilipa Lacerda2017-12-113-8/+11
| | |
| * | Merge branch 'master' into 40468-empty-statesFilipa Lacerda2017-12-11267-1928/+4153
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Fix image view mode Remove the need for destroy and add a comment in the spec Use build instead of create in importer spec Simplify normalizing of paths Fix failing importer test case on MySQL due to missing trailing slash in root path Fix gitlab:import:repos Rake task moving repositories into the wrong location Allow git pull/push on project redirects Resolve "Include asset_sync gem" Use prefix for TableOfContents filter hrefs Resolve "No feedback when checking on checklist if potential spam was detected" Fix Rubocop Fix N+1 query when displaying events Add Chain::Command specs Fix a bug of before_sha being inproperly evaluated to `checkout_sha` Implement and use Gitlab::Ci::Pipeline::Chain::Command Fix invalid pipeline build chain tag evaluation Add docs explaining why you get signed out with "Remember me" Move the circuitbreaker check out in a separate process Migrate Git::Repository#fsck to Gitaly Fix new personal access token showing up in a flash message ...
| * | | Update merge request empty stateFilipa Lacerda2017-12-071-7/+8
| | | |
| * | | Update labels empty state [ci skip]Filipa Lacerda2017-12-072-3/+3
| | | | | | | | | | | | | | | | Update clusters empty state
| * | | Update issues empty state [ci skip]Filipa Lacerda2017-12-071-6/+7
| | | |
| * | | Update pipelines empty state [ci skip]Filipa Lacerda2017-12-072-19/+32
| | | |
* | | | Merge branch '40285-prometheus-loading-screen-no-longer-seems-to-appear' ↵Tim Zallmann2017-12-132-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Prometheus loading screen no longer seems to appear" Closes #40285 See merge request gitlab-org/gitlab-ce!15889
| * | | | add CHANGELOG.md entry for !1588940285-prometheus-loading-screen-no-longer-seems-to-appearMike Greiling2017-12-121-0/+5
| | | | |
| * | | | fix broken empty state assets for environment monitoring pageMike Greiling2017-12-121-3/+3
| | | | |
* | | | | Merge branch 'mk-fix-leaky-spec' into 'master'Stan Hu2017-12-121-4/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE Backport - Fix order-dependent spec failure by avoiding monkeypatching See merge request gitlab-org/gitlab-ce!15893
| * | | | | Fix spec by avoiding monkeypatchingMichael Kozono2017-12-121-4/+13
| | | | | |
* | | | | | Merge branch 'remove-tabindexes-from-tag-form' into 'master'Annabel Dunstone Gray2017-12-122-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed tab indexes from tag form See merge request gitlab-org/gitlab-ce!15886
| * | | | | | removed tab indexes from tag formMarcus Amargi2017-12-122-3/+8
| | | | | | |
* | | | | | | Merge branch 'noteable-touch-return-object' into 'master'Stan Hu2017-12-121-0/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Return the noteable in Note#touch_noteable See merge request gitlab-org/gitlab-ce!15891
| * | | | | | Return the noteable in Note#touch_noteablenoteable-touch-return-objectYorick Peterse2017-12-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows EE to re-use the object, making it easier to trigger indexing of the noteable.
* | | | | | | Merge branch ↵Robert Speicher2017-12-1223-53/+456
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter' into 'master' Refactor member view by using presenter Closes #28004 See merge request gitlab-org/gitlab-ce!15715
| * | | | | | | Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenterRémy Coutable2017-12-1215-42/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Refactor member view by using presenterTM Lee2017-12-1112-25/+375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create MemberPresenter alongside with GroupMemberPresenter and ProjectMemberPresenter - Make Member model Presentable - Move action_member_permission from MembersHelper into the MemberPresenter - Added rspec using double, separate specs for GroupMemberPresenter and ProjectMemberPresenter Fixes #28004. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'tm/docs/docker-extended-entrypoint-fix' into 'master'Achilleas Pipinellis2017-12-121-22/+39
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix entrypoint overriding documentation See merge request gitlab-org/gitlab-ce!15884
| * | | | | | | Refactor entrypoint override docstm/docs/docker-extended-entrypoint-fixAchilleas Pipinellis2017-12-121-61/+36
| | | | | | | |
| * | | | | | | Fix entrypoint overriding documentationTomasz Maczukin2017-12-121-3/+45
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'qa/gb/selenium-handle-domain-sessions' into 'master'Grzegorz Bizon2017-12-1216-119/+154
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle domain sessions better in QA scenarios Closes gitlab-qa#102 See merge request gitlab-org/gitlab-ce!15452
| * | | | | | | Remove noisy notification from QA base pageqa/gb/selenium-handle-domain-sessionsGrzegorz Bizon2017-12-121-2/+0
| | | | | | | |
| * | | | | | | Remove unused page from hashed storage QA scenarioGrzegorz Bizon2017-12-121-1/+0
| | | | | | | |
| * | | | | | | Update browser.rbGrzegorz Bizon2017-12-111-2/+2
| | | | | | | |
| * | | | | | | Update browser.rbGrzegorz Bizon2017-12-111-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into qa/gb/selenium-handle-domain-sessionsGrzegorz Bizon2017-12-11326-2478/+5265
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (93 commits)
| * | | | | | | | Fix minor Rubocop offenses in QA browser runtimeGrzegorz Bizon2017-12-112-2/+4
| | | | | | | | |
| * | | | | | | | Decouple subject's address from page objects in QAGrzegorz Bizon2017-12-0710-33/+40
| | | | | | | | |
| * | | | | | | | Fix QA group creation by filling required filedsGrzegorz Bizon2017-12-071-0/+1
| | | | | | | | |
| * | | | | | | | Fix runtime QA browser and capturing screenshotsGrzegorz Bizon2017-12-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Merge branch 'master' into qa/gb/selenium-handle-domain-sessionsGrzegorz Bizon2017-12-071565-11449/+29480
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (694 commits) Conflicts: qa/qa/page/base.rb qa/qa/page/main/entry.rb
| * | | | | | | | | Make QA runtime browser an actable objectGrzegorz Bizon2017-11-195-60/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | Remove GitLab entry page class in QAGrzegorz Bizon2017-11-172-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | Use QA browser to navigate to pages and handle sessionsGrzegorz Bizon2017-11-1711-18/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | WIP Handle domain sessions better in QA test scenarioGrzegorz Bizon2017-11-178-48/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch 'winh-cleanup-dropdowns' into 'master'Annabel Dunstone Gray2017-12-1232-361/+117
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up new dropdown styles Closes #39142 and #39446 See merge request gitlab-org/gitlab-ce!13676
| * | | | | | | | | | Make label delete option redwinh-cleanup-dropdownsWinnie Hellmann2017-12-083-12/+9
| | | | | | | | | | |
| * | | | | | | | | | Fix hover style for dropdowns on new branches/tags pageWinnie Hellmann2017-12-082-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Fix top margin for right aligned dropdownsWinnie Hellmann2017-12-081-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Remove border radius from pipelines dropdownsWinnie Hellmann2017-12-081-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Remove btn class from template selectorsWinnie Hellmann2017-12-081-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Fix dropdown top marginWinnie Hellmann2017-12-081-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix padding for search dropdownWinnie Hellmann2017-12-081-5/+0
| | | | | | | | | | |