home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,995 Commits 48 Branches 340 Tags
9a2685fae051cc2e2ed87ef59b11ac0b07ef97aa
Commit Graph
26995 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kamil Trzcinski 9a2685fae0 Merge branch 'after-script' into make-before-after-overridable 2016-04-18 10:20:51 -04:00
Kamil Trzcinski 0ce5cc9962 Resolve merge 2016-04-18 10:19:29 -04:00
Kamil Trzcinski 2ab8d3e652 Merge branch 'after-script' into make-before-after-overridable 2016-04-18 09:47:12 -04:00
Kamil Trzcinski aca1e14bd3 Merge remote-tracking branch 'origin/master' into after-script 2016-04-18 09:46:12 -04:00
Kamil Trzcinski 39c2677e86 Merge remote-tracking branch 'origin/master' into after-script 2016-04-18 09:43:45 -04:00
Jacob Schatz 5ae4fd2181 Merge branch 'tasklist-fix' into 'master' 
Fixed issue with tasklist toggling sidebar refresh

Closes #15270

See merge request !3782
 2016-04-18 13:37:27 +00:00
Jacob Schatz 2c8c898318 Merge branch 'import-feedback' into 'master' 
Added loading icon to import buttons

See #14488 for more details

See merge request !3662
 2016-04-18 13:30:16 +00:00
Jacob Schatz d337d27e1c Merge branch 'print-style' into 'master' 
Print style

[test.pdf](/uploads/0dab5c1b2d0c4d0cd7e8930e9b660a9f/test.pdf)

Closes #14201

See merge request !3784
 2016-04-18 13:29:13 +00:00
Jacob Schatz 4d5d619457 Merge branch 'discussion-notes' into 'master' 
Discussion notes update

- At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues
- Moved the dates to be in the header like other notes
- Fixed overlapping issue on mobile

See merge request !3720
 2016-04-18 13:03:24 +00:00
Phil Hughes fe3ac403b9 Addressed feedback 2016-04-18 13:45:26 +01:00
Grzegorz Bizon 06952aaf24 Merge branch 'feature/ci-job-env-variables' into 'master' 
Add environment variables on a job level in CI

Make it possible to define environment variables on a job level.

Closes #14716

See merge request !3612
 2016-04-18 12:28:19 +00:00
Kamil Trzcinski 42102b4344 Merge branch 'after-script' into make-before-after-overridable 2016-04-18 07:53:21 -04:00
Kamil Trzcinski 63bd1f92d9 Fix rubocop complains 2016-04-18 07:51:49 -04:00
Dmitriy Zaporozhets 2b8fc1387b Merge branch 'edit-last-comment' into 'master' 
Scroll to the last comment I made and edit it.

Pressing up in an empty comment box will edit your last comment. 

Also now when you click edit on a comment it will put the cursor at the end.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15267

![scrollup](/uploads/b056fdc479d39311f2be412458028a83/scrollup.gif)

See merge request !3757
 2016-04-18 11:49:42 +00:00
Grzegorz Bizon 1339fda1cd Minor refactorings in CI config 2016-04-18 13:36:52 +02:00
Grzegorz Bizon 2972a991df Add minor fixes in docs for job-specific variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon 2b1c08be8f Validate job-level variables in YAML config file 2016-04-18 13:17:48 +02:00
Grzegorz Bizon a2957291b3 Update documentation on job level build variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon a264973905 Improve grammar in CI documentation for build vars 2016-04-18 13:17:48 +02:00
Grzegorz Bizon 5d89bdb16a Add documentation for job-level build variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon cf3e3effb0 Minor refactoring in code related to job variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon a6260b1eb7 Remove code that removes duplicate CI variables 
At this point this is being handled by GitLab Runner and we need to
introduce this as a separate merge request.
 2016-04-18 13:17:48 +02:00
Grzegorz Bizon 9a74b92d2a Add Changelog entry for job-level variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon bdb06fa043 Improve build specs for job environment variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon 1f3248644e Make CI config return empty array if no job variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon 3dec6e2629 Rename method that returns global envs in CI conf 2016-04-18 13:17:48 +02:00
Grzegorz Bizon b7946b50fc Read job variables directly from gitlab CI config 2016-04-18 13:17:48 +02:00
Grzegorz Bizon b578fbfb85 Make it possible to override build variables 2016-04-18 13:17:47 +02:00
Grzegorz Bizon a1363d39c6 Add variables keyword to job in CI config YAML 2016-04-18 13:17:47 +02:00
Rémy Coutable e32fc7567b Merge branch 'instrument-repository-archive-worker' into 'master' 
Instrument Repository.clean_old_archives

This is done so we have some metrics for https://gitlab.com/gitlab-org/gitlab-ce/issues/15256.

See merge request !3742
 2016-04-18 11:13:51 +00:00
Phil Hughes 167fa5c459 CHANGELOG item 2016-04-18 12:02:39 +01:00
Phil Hughes 1a57601d8c Updated print style 
Closes #14201
 2016-04-18 12:00:20 +01:00
Yorick Peterse 651c3e841d Instrument Repository.clean_old_archives 2016-04-18 12:33:11 +02:00
Rémy Coutable c3f601e829 Merge branch 'fix-method-instrumentation' into 'master' 
Use Module#prepend for method instrumentation

cc @pcarranza 

See merge request !3754
 2016-04-18 10:09:56 +00:00
Phil Hughes c24640c721 Fixed issue with tasklist toggling sidebar refresh 
Closes #15270
 2016-04-18 11:06:30 +01:00
Yorick Peterse 7b6785b3b1 Use Module#prepend for method instrumentation 
By using Module#prepend we can define a Module containing all proxy
methods. This removes the need for setting up crazy method alias chains
and in turn prevents us from having to deal with all that madness (e.g.
methods calling each other recursively).

Fixes gitlab-org/gitlab-ce#15281
 2016-04-18 11:16:31 +02:00
Rémy Coutable 6d899f46b5 Merge branch '14552-signup-password-leak' into 'master' 
Don't populate the password field on signup validation errors

- Previously, we were pulling `params[:user][:password]` as the default
  value for the password field. This is incorrect; we should be pulling
  it from `@user.password` or the like.

[Closes #14552]

See merge request !3691
 2016-04-18 08:27:19 +00:00
Timothy Andrew 38557ec400 Move CHANGELOG entry to a random place. 2016-04-18 12:30:04 +05:30
Timothy Andrew 40bc8e7677 Add acceptance test to check if the user password persists after form redisplays. 
- While signing up.
 2016-04-18 12:19:11 +05:30
Timothy Andrew ed1be10087 Merge remote-tracking branch 'origin/master' into 14552-signup-password-leak 2016-04-18 09:41:20 +05:30
Stan Hu e9f20f5922 Merge branch 'fix-issue-dropzone' into 'master' 
Fixed issue with dropzone not working on new issuable

Closes #15295

See merge request !3760
 2016-04-18 03:02:12 +00:00
Douwe Maan 1c93b33587 Merge branch 'number_sign_for_external_issue_ref' into 'master' 
Add number sign on external issue reference text

Currently, external issue link is `<a ...>123</a>`. After it will be: `<a ...>#123</a>`.

See merge request !3350
 2016-04-17 20:22:32 +00:00
BaldinoF a281f68b64 Add CHANGELOG entry 2016-04-17 18:25:58 +02:00
BaldinoF b04140a1e4 Merge branch 'master' into number_sign_for_external_issue_ref 2016-04-17 18:17:27 +02:00
Kamil Trzcinski c764b57f09 Add note about version 2016-04-17 09:11:37 -04:00
Kamil Trzcinski 38b15e35d4 Update CHANGELOG and add documentation 2016-04-17 09:10:47 -04:00
Kamil Trzcinski 5a7e4dfd33 Merge branch 'after-script' into make-before-after-overridable 
* after-script:
  Add CHANGELOG and documentation
  Rename finally_script to after_script

Conflicts:
	lib/ci/gitlab_ci_yaml_processor.rb
	spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
 2016-04-17 09:06:55 -04:00
Kamil Trzcinski a0afeefd76 Add CHANGELOG and documentation 2016-04-17 09:02:42 -04:00
Kamil Trzcinski cc57d61023 Rename finally_script to after_script 2016-04-17 08:59:57 -04:00
Phil Hughes 0be158a072 Added upload file test to new issue form 2016-04-17 12:15:45 +01:00