root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
51,651 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

136 Commits

Author SHA1 Message Date
Kamil Trzcinski aa440eb1c0
Single commit squash of all changes for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10878 
It's needed due to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10777 being merged with squash.
 2017-05-06 19:04:48 +02:00
Rydkin Maxim 3a7352fddc remove unnecessary space 2017-04-04 21:11:25 +03:00
Rydkin Maxim 2d7bc69596 adds tooltips into several places 2017-04-04 21:11:24 +03:00
Phil Hughes d48b95e285 Fixed the job tootip being cut-off 
Closes #29800
 2017-03-22 09:12:06 +00:00
Filipa Lacerda b57027f2a5 Use a new class to keep old behavior 2017-02-08 20:52:08 -06:00
Kamil Trzciński 5ac590677f Merge branch '25910-convert-manual-action-icons-to-svg-to-propperly-position-them' into 'master' 
Convert pipeline action icons to svg to have them propperly positioned

Closes #25910

See merge request !8766
 2017-01-31 11:42:06 +00:00
Filipa Lacerda 6679a9062a Use badge partial as single source of truth instead of having 2 partials doing the same 
Update changelog description

Changes after review
 2017-01-27 14:36:46 +00:00
Filipa Lacerda 4ab83117fb Changes after review 2017-01-27 14:27:07 +00:00
Filipa Lacerda a087283335 Use new partial to render a badge without a link in the builds details. Preventing from having a link to itself. 
Adds MR ID to CHANGELOG entry
 2017-01-27 14:27:07 +00:00
Filipa Lacerda 10178af1fd Fixes after review 2017-01-26 20:38:21 +00:00
Filipa Lacerda 819ae974d7 Fix broken tests 
Fix linter error
 2017-01-25 15:44:45 +00:00
dimitrieh 066155704d added icons and fixed mini pipeline action dropdown icons 2017-01-25 15:44:44 +00:00
Kushal Pandya fa21471af6 HAMLLint: Fix `UnnecessaryInterpolation` offences 2017-01-24 10:09:28 -08:00
Alfredo Sumaran c8f53f0e14 Merge branch 'didemacet-ci-lint-page' into 'master' 
Change CI template linter textarea with Ace Editor

Closes #24179 and #19701

See merge request !8452
 2017-01-09 19:32:15 +00:00
Alfredo Sumaran 8032df64de Move specific javascript definition the top 2017-01-06 19:02:53 -05:00
Filipa Lacerda 043cc8196e 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
 2017-01-05 10:01:50 -06:00
Clement Ho f4772b37c9 Change CI template linter textarea with Ace Editor 2017-01-04 15:50:07 -06:00
Kushal Pandya 598d8cab32 HAMLLint: Fix `SpaceBeforeScript` offences 2016-12-31 11:43:08 +05:30
Filipa Lacerda 9edef45ae1 Resolve conflict 
Fix tooltips in dropdown
 2016-12-19 23:44:34 +00:00
Mitchell Hentges 66ff2dede1 Make CI badge hitboxes better match container 2016-12-19 10:13:25 -08:00
Grzegorz Bizon dc68a91c44 Fix CI/CD statuses actions' CSS on pipeline graphs 2016-12-17 13:34:35 +01:00
Grzegorz Bizon 1b313e8db8 Make CI/CD detailed status group concept explicit 2016-12-16 20:03:44 +01:00
Filipa Lacerda e42de89a15 Changes after review 
Changes after review

Fix tooltip title

Remove unneeded string interpolation
 2016-12-15 20:43:01 +00:00
Grzegorz Bizon e998d6fb59 Simplify graph status badge partial and require locals 2016-12-14 20:06:24 +01:00
Filipa Lacerda 98a12e535f Fix extension in file 2016-12-14 17:18:00 +00:00
Filipa Lacerda 281237d773 Changes after review 
Remove empty line
 2016-12-14 15:12:58 +00:00
Filipa Lacerda 268a201cce Rename file according to review 2016-12-14 14:24:25 +00:00
Filipa Lacerda 4ba48d6b05 Merge two partials into one. Rename it to match the other partials 2016-12-14 14:17:02 +00:00
Filipa Lacerda 863146d42e Remove unused file 2016-12-14 14:16:28 +00:00
Grzegorz Bizon 7217a19e72 Merge branch 'master' into 22604-manual-actions 
* master: (151 commits)
  Improve build status specs contexts descriptions
  Add some missing tests for detailed status methods
  Fix wrong error message expectation in API::Commits spec
  Remove trailing blank line from Allowable module
  Move admin settings spinach feature to rspec
  Encode when migrating ProcessCommitWorker jobs
  Prevent overflow with vertical scroll when we have space to show content
  Make rubocop happy
  API: Ability to cherry-pick a commit
  Be smarter when finding a sudoed user in API::Helpers
  Update manual build icon SVG
  Make it possible to mix `Gitlab::Routing` in
  Backport hooks on group policies for the EE-specific implementation
  Extract abilities checking module from ability model
  Extend tests for pipeline detailed status helpers
  Add tests for common build detailed status helpers
  Add missing tests for build `cancelable?` method
  Add tests for detailed build statuses factory
  Make it possible to retry build that was canceled
  Make build retryable only if complete and executed
  ...

Conflicts:
	app/assets/stylesheets/pages/pipelines.scss
	app/models/ci/build.rb
	app/models/ci/pipeline.rb
	app/models/ci/stage.rb
	app/models/commit_status.rb
	app/views/admin/runners/show.html.haml
	app/views/projects/builds/_header.html.haml
	app/views/projects/ci/builds/_build.html.haml
	app/views/projects/ci/builds/_build_pipeline.html.haml
	app/views/projects/ci/pipelines/_pipeline.html.haml
	app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
	app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
	app/views/projects/pipelines/_info.html.haml
	lib/gitlab/ci/status/build/common.rb
	lib/gitlab/ci/status/build/play.rb
	lib/gitlab/ci/status/build/stop.rb
	lib/gitlab/ci/status/core.rb
	spec/lib/gitlab/ci/status/pipeline/common_spec.rb
 2016-12-14 14:37:05 +01:00
Grzegorz Bizon 6757aaa120 Improve build status specs contexts descriptions 2016-12-14 11:36:19 +01:00
Filipa Lacerda a06016d00c Remove unneeded partial 2016-12-13 11:38:34 +00:00
Grzegorz Bizon be13fc68e7 Fix detailed status badge for generic commit status 
[ci skip]
 2016-12-12 15:17:18 +01:00
Grzegorz Bizon dc67554c08 Improve detailed status badge partial 2016-12-12 13:28:02 +01:00
Kamil Trzcinski d1dd89356c Rename icon_with_label to icon_with_description 2016-12-12 12:59:01 +01:00
Kamil Trzcinski 980009e6e8 Fix auto loading of constants for Ci Statuses 2016-12-12 12:59:01 +01:00
Kamil Trzcinski feaf01802c Remove ci_status_with_icon helper and replace it with partial [ci skip] 2016-12-12 12:59:01 +01:00
Filipa Lacerda 1e8271b60b Adds new partial for graph icons. 
Fix tests
 2016-12-09 17:24:21 +00:00
Filipa Lacerda b64cf8405c Renders new icons for the pipeline graph 2016-12-08 17:58:32 +00:00
Kamil Trzcinski 203c904057 Add icon_with_name_and_action and use it everywhere 2016-12-08 18:19:17 +01:00
Kamil Trzcinski f6240862c8 Rename icon_with_label to icon_with_description 2016-12-08 18:16:23 +01:00
Kamil Trzcinski 5b89ec0dbf Fix auto loading of constants for Ci Statuses 2016-12-08 17:52:24 +01:00
Kamil Trzcinski 65f3206024 Remove ci_status_with_icon helper and replace it with partial [ci skip] 2016-12-08 11:03:01 +01:00
Rémy Coutable d51bb99a7e
Merge commit 'dev/security' into 'master' 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-10-06 08:33:11 +02:00
Katarzyna Kobierska 3ef515f3f1 Refactor fields in view 2016-09-30 12:22:55 +02:00
Katarzyna Kobierska 7dfb204ef9 Expose jobs to view 2016-09-30 12:22:55 +02:00
Katarzyna Kobierska b13502ef82 Add test for linter values visibility 2016-09-30 12:22:55 +02:00
Katarzyna Kobierska 375072aa27 Add missing values to linter 2016-09-30 12:22:55 +02:00
Grzegorz Bizon 528b988aea Escape HTML nodes in builds commands in ci linter 2016-09-26 11:48:43 +02:00
Z.J. van de Weg c4e00dcc26 Add title to CI lint page 2016-08-30 13:28:24 +02:00