summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Set default sort for tags to Last updated25925-fix-tag-sorting-and-filtering-optionsSam Rose2016-12-284-37/+51
| | | | | Fix spacing between nav control elements Wrap navigation text on Tags list page
* Merge branch '18786-go-to-a-project-order' into 'master' Alfredo Sumaran2016-12-275-3/+9
|\ | | | | | | | | | | | | Go to a project order Closes #18786 See merge request !7737
| * Go to a project orderJacopo2016-12-155-3/+9
| | | | | | | | The order of "Go to a project" dropdown is based on last_activity_at
* | Merge branch '25907-limited-container' into 'master' Fatih Acet2016-12-271-29/+31
|\ \ | | | | | | | | | | | | | | | | | | Only limit container width on issues & MRs within fixed-width container Closes #25907 See merge request !8330
| * | Only limit container width on issues & MRs within fixed-width container25907-limited-containerAnnabel Dunstone Gray2016-12-271-29/+31
| | |
* | | Merge branch '25997-label-text-are-not-vertically-aligned' into 'master' Annabel Dunstone Gray2016-12-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Changed the label font size See merge request !8274
| * | | Changed the label font size from 13px to 12px25997-label-text-are-not-vertically-alignedJose Ivan Vargas2016-12-271-1/+1
| | | | | | | | | | | | | | | | odd sizes don't mix well with windows and some linux system fonts
* | | | Merge branch 'issues/8081' into 'master' Annabel Dunstone Gray2016-12-274-19/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Issues/8081 See merge request !7908
| * | | | add changelog entryBM5k2016-12-061-0/+4
| | | | |
| * | | | rename theme to match actual colorsBM5k2016-12-063-9/+9
| | | | |
| * | | | rename graphite theme variables for consistencyBM5k2016-12-061-5/+5
| | | | |
| * | | | rename charcoal theme variables for consistencyBM5k2016-12-021-5/+5
| | | | |
* | | | | Merge branch '1659-long-tag-title' into 'master' Annabel Dunstone Gray2016-12-277-42/+91
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Truncate the tag description and improve mobile layout for individual tag Closes #1659 See merge request !8220
| * | | | | Truncate tag description and fix mobile for inidividual tag1659-long-tag-titleSam Rose2016-12-277-42/+91
| | | | | |
* | | | | | Update CHANGELOG.md for 8.15.2Robert Speicher2016-12-2713-48/+15
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'dz-rename-reserved-project-names' into 'master' Dmitriy Zaporozhets2016-12-275-3/+189
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename projects with reserved path names See merge request !8234
| * \ \ \ \ \ Merge branch 'master' into 'dz-rename-reserved-project-names'Dmitriy Zaporozhets2016-12-27130-424/+1476
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | Fix rename projects spec so it doesn't hangdz-rename-reserved-project-namesYorick Peterse2016-12-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This spec would hang due to the use of transactions, and would incorrectly stub Thread.new.
| * | | | | | Removed return from reserved project migrationYorick Peterse2016-12-241-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This return is redundant as the query now uses "WHERE EXISTS (...)" to filter out projects without a namespace.
| * | | | | | Fix parallel renaming of reserved projectsYorick Peterse2016-12-241-26/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures threads don't re-use the same connection object, and use fewer queries to perform the work.
| * | | | | | Rename projects with reserved path namesDmitriy Zaporozhets2016-12-245-3/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cant have project with name 'project' or 'tree' anymore. This merge request containts a migration that will find and rename all projects using reserved names by adding N digit to the end of the name. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'master' into 'master' Annabel Dunstone Gray2016-12-272-1/+11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Fixes issue boards list colored top border visual glitch See merge request !7898
| * | | | | | Fix Changelog entry for !7898Pier Paolo Ramon2016-12-031-1/+1
| | | | | | |
| * | | | | | Add Changelog entry for !7898Pier Paolo Ramon2016-12-021-0/+4
| | | | | | |
| * | | | | | Extend the list header top border to the edge of the box Pier Paolo Ramon2016-12-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With border board lists (those created from labels) the top border created bad visual artifacts with the .board-inner gray border. With this change the colored border overflows the padding-box of .board-inner and extends to the edges. It works very well with most colors, excepts for very light ones (such as `#ff0` yellow for instance).
| * | | | | | Minor white-space source formattingPier Paolo Ramon2016-12-021-1/+1
| | | | | | |
* | | | | | | Merge branch 'resolve-note-svg-color' into 'master' Annabel Dunstone Gray2016-12-272-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed discussion note resolve button SVG color See merge request !8250
| * | | | | | | Fixed discussion note resolve button SVG colorresolve-note-svg-colorPhil Hughes2016-12-222-6/+6
| | | | | | | |
* | | | | | | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-2728-137/+384
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to add deploy keys with write-access Closes #1376 See merge request !7383
| * | | | | | | | Rubocop prefers to indent this wayfeature/1376-allow-write-access-deploy-keysLin Jen-Shin2016-12-201-2/+2
| | | | | | | | |
| * | | | | | | | Use consistent names and move checks to the method,Lin Jen-Shin2016-12-203-43/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and move those checks to be private. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_20285012 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_20285279
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-201040-5142/+29726
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-12381-1849/+5732
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
| | | | | | | | | | |
| * | | | | | | | | | Fix tests and also add tests for non-existing repoLin Jen-Shin2016-12-101-1/+15
| | | | | | | | | | |
| * | | | | | | | | | Use consistent words, feedback:Lin Jen-Shin2016-12-104-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_19581826
| * | | | | | | | | | Check project existence for push too, andLin Jen-Shin2016-12-101-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't have to check for deploy key for downloading because deploy key could certainly download when it could already read the project. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_19578626
| * | | | | | | | | | Don't pass the actor for deploy key, feedback:Lin Jen-Shin2016-12-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_19579483
| * | | | | | | | | | Now we need to include EmailHelpers for each testLin Jen-Shin2016-12-062-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Prefer guest_can_download_code? and fix typoLin Jen-Shin2016-12-062-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Prefer guest_can_downlod_code?Lin Jen-Shin2016-12-061-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-061491-9599/+15710
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-226-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-22506-2813/+13514
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | | | | | | | | | | Add tests for key/deploy key notificationsLin Jen-Shin2016-11-182-0/+24
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix an old copypasta: internal -> privateLin Jen-Shin2016-11-181-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Check download privilege more specifically andLin Jen-Shin2016-11-181-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add another error message for the new error.
| * | | | | | | | | | | | Still grant :download_code if guest could do thatLin Jen-Shin2016-11-181-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_18518792
| * | | | | | | | | | | | Check if the key could really download, feedback:Lin Jen-Shin2016-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_18518792