summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Corrected docs href'scorrect-gitlab-host-referencesLuke "Jared" Bennett2017-01-303-4/+3
|
* Merge branch '26129-add-link-to-branches-page' into 'master' Clement Ho2017-01-101-1/+2
|\ | | | | | | | | | | | | Resolve "Add link to Branches page help text?" Closes #26129 See merge request !8377
| * squash 3 commitsKen Ding2017-01-101-1/+2
| |
* | Merge branch 'auto-pipelines-vue' into 'master' Fatih Acet2017-01-091-14/+27
|\ \ | | | | | | | | | | | | Pipelines Vue See merge request !7196
| * \ Merge branch 'master' into auto-pipelines-vueRegis2017-01-0919-140/+145
| |\ \
| * \ \ Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-0511-35/+60
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (35 commits) Adds back removed class in merge request pipelines table Fix dropdown icon alignment Simplify HTML of mini pipeline graph and dropdown Creates individual html for dropdown Adds simplified CSS for the new dropdown Removes old CSS Improves dropdown item in Chrome, Firefox and Safari Use SCSS variables for colors. Fix scss linter errors Adds animation when the stage is hovered. Adds back tooltip on dropdown toggle Fixes broken tests additional css changes to get more into direction of mockups Adds CHANGELOG entry Removes unneeded `window` declaration Decreases font-size on login page Ensure internal Gitlab::Git references use the namespace Absorb gitlab_git Fix review comments. Add spec for note edit and fix one commented spec. Review fixes. Use gl.utils.isInViewport and improve gl.utils.animateToElement. Make sure elements share the same scope Hide edit warning element when form reverted. Remove unnecessary styling came from merge conflicts. Fix single note edit form specs. Separate edit form in Changes and Discussions tab. Fix warning styling for responsive design. Fix task list for single edit note widget changes. Fix notes spec. ...
| * \ \ \ Merge branch 'master' into auto-pipelines-vue - fixes haml lint errorRegis2017-01-041-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2017-01-0412-39/+41
| |\ \ \ \ \
| * | | | | | fix haml_lint complaintsRegis2017-01-021-2/+2
| | | | | | |
| * | | | | | fix pipelines/index.html.haml merge conflictRegis2017-01-02236-775/+807
| |\ \ \ \ \ \
| * | | | | | | add manual icon to svgsRegis2016-12-261-0/+1
| | | | | | | |
| * | | | | | | add borderless svgsRegis2016-12-261-0/+8
| | | | | | | |
| * | | | | | | merge master and fix application.rb conflictRegis2016-12-2334-172/+220
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-2170-224/+499
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (367 commits) Set “Remove branch” button to default size remove unused helper method reduce common code even further to satisfy rake flay remove button class size alteration from revert and cherry pick links factor out common code to satisfy rake flay homogenize revert and cherry-pick button styles generated by commits_helper apply margin on alert banners only when there is one or more alerts Rename MattermostNotificationService back to MattermostService Rename SlackNotificationService back to SlackService Fix stage and pipeline specs and rubocop offenses Added QueryRecorder to test N+1 fix on Milestone#show Use gitlab-workhorse 1.2.1 Make 'unmarked as WIP' message more consistent Improve specs for Files API Allow unauthenticated access to Repositories Files API GET endpoints Add isolated view spec for pipeline stage partial Move test for HTML stage endpoint to controller specs Fix sizing of avatar circles; add border Fix broken test Fix broken test Changes after review ... Conflicts: app/assets/stylesheets/pages/pipelines.scss app/controllers/projects/pipelines_controller.rb app/views/projects/pipelines/index.html.haml spec/features/projects/pipelines/pipelines_spec.rb
| * | | | | | | | | all svgs from index hamlRegis2016-12-161-0/+2
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into auto-pipelines-vueRegis2016-12-169-15/+13
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-1528-59/+61
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (73 commits) Remove pages/snippets css Remove unused bootstrap imports Shift emojis and icons styles into framework Introduce deployment services, starting with a KubernetesService Username exists check respects the relative root URL add node_modules to our eslintignore settings Remove white space between nav items fix transient timing failure adding timecop Improve build status specs contexts descriptions Add some missing tests for detailed status methods Fix wrong error message expectation in API::Commits spec resolve all instances of no-undef eslint rule violations Remove trailing blank line from Allowable module expand remaining non-explicit eslint-disable blocks and factor ... Introduce $CI_BUILD_REF_SLUG Finish refactoring grays Combining more grays Remove duplicate shades of gray and black Encode when migrating ProcessCommitWorker jobs Prevent overflow with vertical scroll when we have space to show ... ...
| * \ \ \ \ \ \ \ \ \ \ merge masterRegis2016-12-1329-162/+154
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | dynamic API consumption for SVGsRegis2016-12-131-17/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | pass svg as prop to commit componentRegis2016-12-121-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-0929-102/+140
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Update "Installation from source" guide for 8.15.0 Group links spec update Updates the font weight of button styles because of the change to system fonts Refactor SSH keys docs Improvements to setting up ssh Do not reload diff for merge request made from fork when target branch in fork is updated Add 8.12.10, 8.12.11, and 8.12.12 CHANGELOG.md items Changes after review Fix broken test Adds CHANGELOG entry Adds tests Uniformize props name format Replace commit icon svg logic Replace play icon svg logic Updated JS based on review Fixed group links dropdown to match Update docs to reflect new defaults on omnibus Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' Merge branch 'html-safe-diff-line-content' into 'security' Merge branch 'rs-filter-authentication_token' into 'security' Merge branch 'destroy-session' into 'security' ... Conflicts: app/models/ci/pipeline.rb app/models/commit_status.rb app/views/projects/ci/pipelines/_pipeline.html.haml app/views/projects/commit/_pipeline.html.haml app/views/projects/pipelines/_with_tabs.html.haml app/views/projects/pipelines/index.html.haml lib/api/helpers.rb
| * | | | | | | | | | | | | conform to status object for svg icon namesRegis2016-12-071-8/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-0722-91/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (114 commits) Remove dashboard.scss Update custom_hooks.md for global custom hooks and chained hook info Move admin hooks spinach to rspec Move admin logs spinach test to rspec Fix 404 error when visit group label edit page A simpler implementation of finding a merge request Encourage bug reporters to mention if they use GitLab.com Bump gitlab-shell version to 4.0.3 Remove confirmation.scss Explain "js: true" in "deleted_source_branch_spec.rb" Move award emojis to framwork Move image styles to framework Remove tags.scss Remove caching of Repository#has_visible_content? Add text example for pipeline status without action Use detailed status as CSS class in pipelines list Use status text when redering pipelines list Improve support for icons in new detailed statuses Add status label information to pipeline header Untangle status label and text in ci status helper ...
| * | | | | | | | | | | | | | remove all files related to Vue SVG rendering - use dynamic svg loadingRegis2016-12-061-2/+16
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix exception related to pipeline stages in viewGrzegorz Bizon2016-12-061-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | can render all tabs for pipelines - remove uneeded properties - [ci skip]Regis2016-12-051-13/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fix conflictRegis2016-12-0218-98/+128
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | add svg to pipeline index haml - prep for commit comp change - [ci skip]Regis2016-12-011-0/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-0117-124/+220
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (73 commits) Refactor JiraService by moving code out of JiraService#execute method Rename a label to fix an intermittently-failing spec Refactor the Git submodules with CI docs Add CHANGELOG entry Improve Gitlab::GitAccessWiki spec with download access checks Improve ProjectPolicy spec to check permissions when wiki is disabled Allow access to the wiki with git when repository feature disabled Refactor branch chooser in issuable form Improve the `Gitlab::OAuth::User` error message Disable the ee_compat_check task on dev Make the downtime_check task happy Revert bump in rufus-scheduler Fix comma-dangle in function's arguments errors Improvements after review Use created date from last_deployment API: Expose branch status Grapify the files API Move task helpers to a module Fixed GFM autocomplete regex Add Human Readable Timestamp to backup tar file ...
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-11-29100-436/+744
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-11-2112-113/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge masterRegis2016-11-1831-145/+324
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-11-154-3/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | more fine tuning - catching edge cases - progress in testing - [ci skip]Regis2016-11-151-2/+0
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'avatar-vue' into auto-pipelines-vueRegis2016-11-1512-13/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into avatar-vueRegis2016-11-1412-13/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fix broken pipeline rendering [ci skip]Kamil Trzcinski2016-11-151-8/+5
| |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | vue full conflict fixRegis2016-11-1123-207/+194
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-11-106-5/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | re-wire count for pagination - refactorRegis2016-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | attempRegis2016-11-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Support pipelines APIKamil Trzcinski2016-11-104-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass `updated_at` to get only incremental changes since last update
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into auto-pipelines-vueRegis2016-11-0945-141/+219
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-11-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | extract pagination into own folder and precompile in application.rbRegis2016-11-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | making reusable status and status icons componentsRegis2016-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into auto-pipelines-vueRegis2016-11-0434-42/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | conditional render to have running - branches - tags be HAMLRegis2016-11-031-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | count passing through - last page knownRegis2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into auto-pipelines-vueRegis2016-11-0240-212/+361
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \