summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use Vue warnhandlerwinh-use-vue-warnhandlerWinnie Hellmann2017-11-061-18/+22
|
* Merge branch 'expose-job-duration' into 'master'Rémy Coutable2017-11-063-1/+17
|\ | | | | | | | | | | | | Expose `duration` in Job API entity Closes #35794 See merge request gitlab-org/gitlab-ce!13644
| * Expose `duration` in Job API entityMehdi Lahmam2017-11-053-1/+17
| | | | | | | | Closes #35794.
* | Merge branch 'jej/fix-lfs-changes-laziness' into 'master'Douwe Maan2017-11-066-46/+108
|\ \ | | | | | | | | | | | | Implement lazy popen so LfsChanges doesn't have to wait for rev-list to complete See merge request gitlab-org/gitlab-ce!15180
| * | Gitlab::Git::RevList and LfsChanges use lazy popenjej/fix-lfs-changes-lazinessJames Edwards-Jones2017-11-064-44/+84
| | |
| * | Gitlab::Git::Popen can lazily hand output to a blockJames Edwards-Jones2017-11-062-2/+24
| | | | | | | | | | | | | | | | | | This allows input to start processing immediately without waiting for the process to complete. This also allows long or infinite inputs to be partially processed, which will termiate the process when reading stops with SIGPIPE.
* | | Merge branch 'ce-gitlab-git-backport' into 'master'Sean McGivern2017-11-0611-80/+228
|\ \ \ | | | | | | | | | | | | | | | | CE repository mirroring changes backport See merge request gitlab-org/gitlab-ce!15184
| * | | Use Gitlab::Git operations for repository mirroringce-gitlab-git-backportAlejandro Rodríguez2017-11-032-33/+0
| | | |
| * | | Encapsulate git operations for mirroring in Gitlab::GitAlejandro Rodríguez2017-11-038-43/+188
| | | |
| * | | Create a Wiki Repository's raw_repository properlyAlejandro Rodríguez2017-11-033-4/+25
| | | |
| * | | Add `Gitlab::Git::Repository#fetch` commandAlejandro Rodríguez2017-11-031-0/+15
| | | |
* | | | Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttonsFilipa Lacerda2017-11-065-3/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added discussion_line_code value to note response and use it to query the right… Closes #38677 See merge request gitlab-org/gitlab-ce!14981
| * | | | Use diff_discussion? instead of is_a?(DiffDiscussion)38677-render-new-discussions-on-diff-tabLuke "Jared" Bennett2017-11-021-1/+1
| | | | |
| * | | | Added changelogLuke "Jared" Bennett2017-10-301-0/+5
| | | | |
| * | | | FE review changes - remove internal details assertion and look for closest ↵Luke "Jared" Bennett2017-10-272-5/+1
| | | | | | | | | | | | | | | | | | | | form if no discussion_line_code
| * | | | Add spec for root diff discussion noteLuke "Jared" Bennett2017-10-241-2/+22
| | | | |
| * | | | Fix karmaLuke "Jared" Bennett2017-10-232-1/+2
| | | | |
| * | | | Remove trailing commaLuke "Jared" Bennett2017-10-211-1/+1
| | | | |
| * | | | Improve discussion_line_code set and update notes_controller_specLuke "Jared" Bennett2017-10-212-1/+7
| | | | |
| * | | | Added discussion_line_code value to note response and use it to query the ↵Luke "Jared" Bennett2017-10-212-2/+4
| | | | | | | | | | | | | | | | | | | | right row for the discussion UI
* | | | | Merge branch ↵Kamil Trzciński2017-11-062-2/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/37299-environments-validate-uniqueness-on-url-and-can-cause-silent-deployment-failures' into 'master' Remove unique validation from external_url in Environment Closes #37299 See merge request gitlab-org/gitlab-ce!15202
| * | | | | Remove unique validation from external_url in Environmentfix/sm/37299-environments-validate-uniqueness-on-url-and-can-cause-silent-deployment-failuresShinya Maeda2017-11-062-2/+0
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix/sm/39817-fix-cron_parser_spec-rb' into 'master'Rémy Coutable2017-11-061-6/+42
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix cron_parser_spec.rb (`master` branch failure on Nov 5th) Closes #39817 See merge request gitlab-org/gitlab-ce!15196
| * | | | Add TimeCop freeze for DST and Regular timefix/sm/39817-fix-cron_parser_spec-rbShinya Maeda2017-11-051-6/+42
|/ / / /
* | | | Merge branch '37473-expose-project-visibility-as-ci-variable' into 'master'Kamil Trzciński2017-11-054-1/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Expose project visibility as CI variable" Closes #37473 See merge request gitlab-org/gitlab-ce!15193
| * | | | Harcode project visibility37473-expose-project-visibility-as-ci-variableMatija Čupić2017-11-051-1/+1
| | | | |
| * | | | Expose project visibility as CI variableMatija Čupić2017-11-044-1/+9
| | | | |
* | | | | Merge branch 'fix_migration_that_adds_ff_merge_field' into 'master'Stan Hu2017-11-042-1/+10
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix a migration that adds merge_requests_ff_only_enabled column to MR table Closes #39382 and #39357 See merge request gitlab-org/gitlab-ce!15195
| * | | | update a changelogValery Sizov2017-11-041-0/+5
| | | | |
| * | | | Put a condition to old migration that adds fast_forward column to MRsValery Sizov2017-11-041-1/+5
|/ / / /
* | | | Merge branch 'sh-headless-chrome-support' into 'master'Stan Hu2017-11-03149-456/+624
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace PhantomJS with Headless Chrome for GitLab Integration Tests Closes #30876 See merge request gitlab-org/gitlab-ce!12244
| * | | | fix flaky tests by removing unneeded clicks and focus actionsMike Greiling2017-11-031-16/+1
| | | | |
| * | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-03102-834/+1294
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (33 commits) Ignore SQL CACHE hits in Sherlock Fix SQL timings for the performance bar Find the LFS-objects for a fork within a the fork network Remove bottom-border from last responsive table row Add system hooks user_rename and group_rename Unlink a project from a fork network when it's source was deleted. Make sure the settings page renders when root of a fork is deleted Remove Peek's original keyboard shortcut (numpad 0, keycode 96) Add application setting to Auto DevOps docs Enable MergeableSelector in scss-lint (for !14567) Enable MergeableSelector in scss-lint (for !14055) Enable MergeableSelector in scss-lint (for !14062) Enable MergeableSelector in scss-lint (for !14398) Enable MergeableSelector in scss-lint (for !13480) Enable MergeableSelector in scss-lint (for !13473) Enable MergeableSelector in scss-lint (for !13600) Enable MergeableSelector in scss-lint Resolve ""To do" should be "Todos" on Todos list page" Avoid regenerating the ref path for the environment Remove white space at bottom of issue boards ...
| * | | | | fix flaky test in gfm_autocomplete_spec.rbMike Greiling2017-11-031-1/+0
| | | | | |
| * | | | | don't attempt to click on hidden elementsMike Greiling2017-11-031-4/+6
| | | | | |
| * | | | | replace use of unsupported trigger method with clickMike Greiling2017-11-032-2/+2
| | | | | |
| * | | | | prevent race condition when attempting to cancel a file uploadMike Greiling2017-11-031-2/+4
| | | | | |
| * | | | | confirm javascript modal when resetting email tokensMike Greiling2017-11-031-2/+2
| | | | | |
| * | | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-02433-3801/+4275
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (109 commits) Remove Filesystem check metrics that use too much CPU to handle requests Set merge_request_diff_id on MR when creating Add a column linking an MR to its diff Remove useless closeReopenReport specs Clarify external artifacts only working when GitLab pages is enabled Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when the memory killer kicks in Remove an exception from the git user default SSH config check Geo route whitelisting is too optimistic Update .nvmrc to current stable (v9.0.0) Update documentation Address Douwe's feedback Refactor responsive table styles to support nested error block Add changelog items Update specs for sudo behavior Move RSS and incoming email tokens from User Settings > Accounts to User Settings > Access Tokens Remove user authentication_token column Migrate user private tokens to personal access tokens Add sudo API scope Consistently use PersonalAccessToken instead of PersonalToken Remove User#private_token ...
| * | | | | | use resize_window helperMike Greiling2017-11-021-1/+2
| | | | | | |
| * | | | | | refactor wait_for_requests, add slow_requests block helperMike Greiling2017-11-029-50/+64
| | | | | | |
| * | | | | | target label instead of obscured input elementMike Greiling2017-11-021-3/+1
| | | | | | |
| * | | | | | scroll to top before attempting to click the "Side-by-side" buttonMike Greiling2017-11-021-3/+2
| | | | | | |
| * | | | | | remove out-of-date comments about webdriver compatabilityMike Greiling2017-11-021-5/+1
| | | | | | |
| * | | | | | explicitly add Accept: */* HTTP header back to testMike Greiling2017-11-021-1/+3
| | | | | | |
| * | | | | | add visible argument to helper rather than duplicating codeMike Greiling2017-11-021-3/+3
| | | | | | |
| * | | | | | add InspectRequests helper automatically to :js testsMike Greiling2017-11-024-5/+1
| | | | | | |
| * | | | | | add CookieHelper and InputHelper automatically to :js testsMike Greiling2017-11-0210-18/+2
| | | | | | |
| * | | | | | fix bracket stylingMike Greiling2017-11-021-5/+5
| | | | | | |
| * | | | | | remove unused capybara_select2 helperMike Greiling2017-11-011-5/+0
| | | | | | |
View Lorry Controller Status