summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Only limit container width on issues & MRs within fixed-width container25907-limited-containerAnnabel Dunstone Gray2016-12-271-29/+31
|
* Merge branch 'resolve-note-svg-color' into 'master' Annabel Dunstone Gray2016-12-271-6/+2
|\ | | | | | | | | Fixed discussion note resolve button SVG color See merge request !8250
| * Fixed discussion note resolve button SVG colorresolve-note-svg-colorPhil Hughes2016-12-221-6/+2
| |
* | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-2710-35/+91
|\ \ | | | | | | | | | | | | | | | | | | Allow to add deploy keys with write-access Closes #1376 See merge request !7383
| * \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-20429-2002/+4060
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (538 commits) Reject blank environment vcariables in Gitlab::Git::RevList Add online terminal documentation Add changelog entry Add terminal UI and controller actions Fix specs Even out padding on plus button in breadcrumb menu Update font size of detail page header to 14px Update CHANGELOG.md for 8.13.10 Update CHANGELOG.md for 8.14.5 Fix Route#rename_children behavior Remove inline-block styling from status Add terminals to the Kubernetes deployment service Add a ReactiveCaching concern for use in the KubernetesService Add xterm.js 2.1.0 and a wrapper class to the asset pipeline Remove unnecessary hidden svg elements for icons. Fix consistent typo in environment.js Use a block to insert extra check for authenticate_build! Align milestone column header with count number Add Wiki import to BB importer Make CI badge hitboxes better match container ...
| * \ \ Merge CSSFilipa Lacerda2016-12-12147-898/+1260
| |\ \ \
| * | | | Adds CSS to match the mockups and makes table responsiveFilipa Lacerda2016-12-122-31/+46
| | | | |
| * | | | Use btn-inverted for New Deploy KeyLin Jen-Shin2016-12-121-1/+1
| | | | |
| * | | | Use consistent words, feedback:Lin Jen-Shin2016-12-104-5/+5
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_19581826
| * | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-06396-3768/+5254
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (488 commits) Merge branch 'issue_25064' into 'security' It's secret variables, not secure Fix dead links, add example of debug trace output, simplify titles Authorize users into imported GitLab project Document button secondary states. Update icons and color section Remove unused votes.scss Remove unused errors css Fixed MR widget content wrapping for XS viewports NIGNX -> Nginx Use pry-byebug instead byebug Fixed influence from other specs. Accept `issue new` as command to create an issue Update paranoia from 2.1.4 to 2.2.0. Use the pagination helper in the API Added changelog for #25221 Fixed top margin for Builds page status header information Satisfied eslint Fix compatibility with Internet Explorer 11 for merge requests change the date label to match the date used fix gfm doc typo about two spaces for next line transfer ...
| * | | | | Allow admin to set keys with write access, andLin Jen-Shin2016-11-224-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show write access information when showing the key. TODO: It's ugly right now, need help!
| * | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-11-22209-1364/+5287
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (497 commits) Use single quote for strings Ue svg from SVGs object Dont trigger CI builds [ci skip] Revert "Test only migrations" Add custom copy for each empty stage Fetch only one revision Highlight nav item on hover Test only migrations Fix migration paths tests Scroll CA stage panel on mobile Fix CSS declaration administer to administrator Move SVGs to JS objects for easy reuse Improve deploy command message No enough data to Not enough data Keep the cookie name as before Fix variable usage Evalute time_ago method instead of printing it Removed button styling from restricted visibility levels and added checkboxes with icons Do not show overview message if there’s already CA data ...
| * | | | | | We removed User#has_access_to?Lin Jen-Shin2016-11-181-1/+3
| | | | | | |
| * | | | | | We never check user privilege if it's a deploy keyLin Jen-Shin2016-11-181-4/+0
| | | | | | |
| * | | | | | Don't notify user for deploy keys, feedback:Lin Jen-Shin2016-11-183-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_18517263
| * | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-11-17254-832/+1177
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (236 commits) Mention Git strategy none Remove ToC since it's now supported in the docs portal itself Add 8.14 to versions with further additions to review apps Add Limitations sections to environments and review apps docs Add link to environments docs Fix URL to review apps docs Add a prerequisites section, add some links Link to NGINX example project for the time being Get rid most of the irrelevant sections Add note about current limitation in $CI_BUILD_REF_NAME Add an intro and an Overview section for Review Apps WIP review apps Add Review apps link to CI README Add stop environment permissions and remove delete Add note about auto-stopping of environments Update CHANGELOG.md for 8.13.6 Finish "Stopping envs" and "Grouping similar envs" sections Highlight first user autocomplete option Remove ToC and fix headings in Markdown docs Revert "Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master'" ...
| * | | | | | | Introduce has_access_to? so that we could reuse itLin Jen-Shin2016-11-163-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_18439108
| * | | | | | | Add more tests and fix write to project checkLin Jen-Shin2016-11-111-0/+4
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-11-101101-9417/+26322
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (3852 commits) Grapify token API Fix cache for commit status in commits list to respect branches Grapify milestones API Grapify runners API Improve EeCompatCheck, cache EE repo and keep artifacts for the ee_compat_check task Use 'Forking in progress' title when appropriate Fix CHANGELOG after 8.14.0-rc1 tag Update CHANGELOG.md for 8.14.0-rc1 Fix YAML syntax on CHANGELOG entry Remove redundant rescue from repository keep_around Remove redundant space from repository model code Remove order-dependent expectation Minor CHANGELOG.md cleanups Add a link to Git cheatsheet PDF in docs readme Grapify the session API Add 8.13.5, 8.12.9, and 8.11.11 CHANGELOG Merge branch 'unauthenticated-container-registry-access' into 'security' Merge branch '23403-fix-events-for-private-project-features' into 'security' Merge branch 'fix-unathorized-cloning' into 'security' Merge branch 'markdown-xss-fix-option-2.1' into 'security' ...
| * | | | | | | | Set current user as deploy key userAli Ibrahim2016-09-031-1/+1
| | | | | | | | |
| * | | | | | | | Rephrase wording for pull/push accessAli Ibrahim2016-08-191-2/+2
| | | | | | | | |
| * | | | | | | | Allow to add deploy keys with write-accessAli Ibrahim2016-08-172-1/+10
| | | | | | | | |
* | | | | | | | | Merge branch ↵Douwe Maan2016-12-271-1/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-file' into 'master' Resolve "Gitlab merge request view crash when commiting a js sourcemap file" Closes #25931 See merge request !8310
| * | | | | | | | | Use raw_diffs to calculate MR files changedSean McGivern2016-12-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to create the intermediate FileCollection object with its associated highlighting in order to count how many files changed. Both the compare object and the MR diff object have a raw_diffs method that is perfectly fine for this case.
* | | | | | | | | | Merge branch 'filename-to-file-path' into 'master' Sean McGivern2016-12-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename filename to file path in tooltip of file header in merge request diff See merge request !8314
| * | | | | | | | | | Rename filename to file path in tooltip of file header in merge request diffVictor Wu2016-12-261-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'auto-deploy-with-space' into 'master' Sean McGivern2016-12-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename "autodeploy" to "auto deploy" Closes #25999 See merge request !8289
| * | | | | | | | | | | Rename "autodeploy" to "auto deploy"auto-deploy-with-spaceAdam Niedzielski2016-12-231-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-latest-pipeine-ordering-again' into 'master' Kamil Trzciński2016-12-261-6/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Order only for latest_successful_for See merge request !8301
| * | | | | | | | | | | Order only for latest_successful_forLin Jen-Shin2016-12-261-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8286#note_20461082
* | | | | | | | | | | | Merge branch 'fix-single-team' into 'master' Kamil Trzciński2016-12-261-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix single team selection See merge request !8251
| * | | | | | | | | | | | Fix single team selectionfix-single-teamKamil Trzcinski2016-12-221-1/+3
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '26040-hide-scroll-top' into 'master' Fatih Acet2016-12-261-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide Scroll Top button for failed Build page Closes #26040 See merge request !8295
| * | | | | | | | | | | | Hide Scroll Top for failed buildKushal Pandya2016-12-231-2/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '25909-fix-mr-list-timestamp-alignment' into 'master' Fatih Acet2016-12-261-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes timestamp text alignment in mr-list and issue-list Closes #25909 See merge request !8271
| * | | | | | | | | | | | | fixes timestamp text alignemnt in mr-list and issue-listNur Rony2016-12-231-1/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'label-gfm-error-fix' into 'master' Fatih Acet2016-12-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed error with GFM autocomplete when no data exists See merge request !8288
| * | | | | | | | | | | | | | Fixed error with GFM autocomplete when no data existslabel-gfm-error-fixPhil Hughes2016-12-231-1/+1
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '26026-pipeline-overflow-firefox' into 'master' Fatih Acet2016-12-261-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix line breaking in nodes of the pipeline graph in firefox Closes #26026 See merge request !8292
| * | | | | | | | | | | | | | Fix line breaking in nodes of the pipeline graph in firefox26026-pipeline-overflow-firefoxFilipa Lacerda2016-12-231-4/+3
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds MR ID to CHANGELOG entry
* | | | | | | | | | | | | | Merge branch '26038-fix-confedential-warning-text-alignment' into 'master' Fatih Acet2016-12-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes confidential warning alignment on comment box Closes #26038 See merge request !8293
| * | | | | | | | | | | | | | fixes confedential warning alignment on comment boxNur Rony2016-12-231-1/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 're-style-issue-new-branch' into 'master' Sean McGivern2016-12-262-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In issue view, remove checking branches state See merge request !8023
| * | | | | | | | | | | | | | In issue view, remove checking branches and new branch unavailable statesvictorwu2016-12-262-6/+0
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Replace wording for slash command confirmation messagevictorwu2016-12-261-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-2622-62/+164
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more storage statistics See merge request !7754
| * | | | | | | | | | | | Add more storage statisticsMarkus Koller2016-12-2122-48/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds counters for build artifacts and LFS objects, and moves the preexisting repository_size and commit_count from the projects table into a new project_statistics table. The counters are displayed in the administration area for projects and groups, and also available through the API for admins (on */all) and normal users (on */owned) The statistics are updated through ProjectCacheWorker, which can now do more granular updates with the new :statistics argument.
| * | | | | | | | | | | | Remove unused ProjectsHelper#round_commit_countMarkus Koller2016-12-211-14/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Revert "Merge branch 'fix-latest-pipeine-ordering' into 'master'"Grzegorz Bizon2016-12-242-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !8286
* | | | | | | | | | | | | Merge branch 'fix-cycle-analytics-nav' into 'master' Alfredo Sumaran2016-12-241-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSS fixes on Cycle Analytics page See merge request !8300