home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,148 Commits 48 Branches 340 Tags
efde96e9cd4b0096c19ecfa46237b7eda28038aa
Commit Graph
403 Commits
Author SHA1 Message Date
Jacob Schatz d343c7a159 Merge branch 'comment-discard-button' into 'master' 
Added discard button to comment form

Also changed the labels on the buttons to better match the action they are completing.

Closes #8057

See merge request !3085
 2016-03-11 13:07:43 +00:00
Phil Hughes ee9a6d7fb3 Fixed failing milestone filter tests 2016-03-10 13:54:54 +00:00
Phil Hughes 8d7e0f0ba9 Fixed failing tests 2016-03-10 13:54:54 +00:00
Robert Speicher 599a6d7873 Allow the initial admin to set a password 
Closes #1980
 2016-03-04 17:37:57 -05:00
Phil Hughes da6e38a889 Fixed tests for comment forms 2016-03-04 10:44:04 +00:00
Robert Speicher 4fcaa7a474 Fix issue milestone filter spec 2016-02-26 18:14:49 -05:00
Tomasz Maczukin 49d5c35b69 Fix old usages of ci_runner factory 2016-02-19 13:18:49 +01:00
Kamil Trzcinski 170ca8435a Merge branch 'master' into ci-permissions 
# Conflicts:
#	db/schema.rb
 2016-02-05 20:15:32 +01:00
Dmitriy Zaporozhets eaad236b45 Remove project-issuable-filter from admin builds page :) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-05 11:53:06 +01:00
Kamil Trzcinski 6fea7c386f Merge remote-tracking branch 'origin/master' into ci-permissions 
# Conflicts:
#	app/views/projects/builds/index.html.haml
 2016-02-04 13:16:48 +01:00
Kamil Trzcinski b4c36130cc Rename allow_guest_to_access_builds to public_builds 2016-02-04 12:57:46 +01:00
Dmitriy Zaporozhets f8a33707b7 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-03 20:21:26 +01:00
Phil Hughes 15bc1a01ab added feature test 2016-01-30 16:01:50 +00:00
Dmitriy Zaporozhets 7e6da7b91a Merge branch 'rs-2fa-requirement-wording' into 'master' 
Update wording for 2FA requirement notice



See merge request !2582
 2016-01-27 19:04:44 +00:00
Grzegorz Bizon 5583b9526b Add specs for build created using generic commit status 2016-01-26 08:34:48 +01:00
Robert Speicher fcab1345da Update wording for 2FA requirement notice 2016-01-23 17:56:18 -08:00
Rémy Coutable 82571eab43 Fix failing specs 2016-01-21 10:08:12 +01:00
Douglas Barbosa Alexandre a8c836c371 Add tests for the wiki pipeline 2016-01-14 12:09:31 -02:00
Grzegorz Bizon ece114e630 Update artifacts download specs 2016-01-14 12:48:14 +01:00
Robert Speicher 6fc1aba4a3 Merge branch 'fix/ci-linter-sequence-validations' into 'master' 
Allow subsequent validations in CI Linter

Closes #5851

See merge request !2368
 2016-01-11 19:09:09 +00:00
Dmitriy Zaporozhets 5500f9159f Merge branch 'group-issues-sorting' into 'master' 
Improve performance of getting issues on group level

For testing I used the URL http://localhost:3000/groups/gitlab-org/issues?milestone_title=8.1. Prior to these changes said URL would take about 10-12 seconds to load. By applying these changes the loading time has been reduced to roughly 2-3 seconds. 

There's still some stuff going on in some views that I have to look at, resolving those changes might reduce the loading time a bit more. I also still have to check if I didn't break too many tests.

Fixes: gitlab-org/gitlab-ce#3707 gitlab-org/gitlab-ce#4071 

See merge request !2318
 2016-01-11 15:28:41 +00:00
Grzegorz Bizon cdd3a80682 Allow subsequent validations in CI Linter 
Closes #5851
 2016-01-11 13:37:31 +01:00
Yorick Peterse 9b0c360bd5 Fixed issue sorting specs for ID changes 
These specs assumed data was still sorted by timestamp, instead of by
ID.
 2016-01-07 14:53:02 +01:00
Douwe Maan fd91b48f24 Merge branch 'master' into milestone-ref 2016-01-05 16:40:23 +01:00
Dmitriy Zaporozhets e6713cd945 Merge branch 'improved-leave-project' into 'master' 
Adds settings menu to the top for editting and leaving projects

@creamzy @skyruler @dzaporozhets 
Menu contents depends on user's rights.

Fixes #4221


![Screen_Shot_2015-12-23_at_10.02.47_PM](/uploads/daeaef937bf9d9f4db7ccb674e344ac1/Screen_Shot_2015-12-23_at_10.02.47_PM.png)
![Screen_Shot_2015-12-23_at_10.02.41_PM](/uploads/58eb4eea7d640f01d7f05c2a408a2c04/Screen_Shot_2015-12-23_at_10.02.41_PM.png)
![Screen_Shot_2015-12-23_at_10.02.55_PM](/uploads/4b2ae027a13efcbad3eb81b04f134c4f/Screen_Shot_2015-12-23_at_10.02.55_PM.png)
![Screen_Shot_2015-12-23_at_10.04.47_PM](/uploads/bd5d9d8ddd72d16d74c32c6c1f569776/Screen_Shot_2015-12-23_at_10.04.47_PM.png)


See merge request !2195
 2016-01-05 09:34:13 +00:00
Jacob Schatz 6180560318 rempves tests for "you have master access" text 2016-01-04 10:36:53 -05:00
Douglas Barbosa Alexandre 567dc62b6d Show 'All' tab by default in the builds page 2016-01-04 10:21:10 -02:00
Jacob Schatz d985d08a19 adds proper it for multi line. adds find with correct id for button. 2015-12-28 17:37:03 -05:00
Jacob Schatz 8ee6abaaf4 fixes tests failing 2015-12-28 14:45:23 -05:00
Douwe Maan 7dedd997b9 Merge branch 'master' into milestone-ref 2015-12-25 13:16:33 +01:00
Gabriel Mazetto b61a5bc20c specs for forced two-factor authentication and grace period 
simplified code and fixed stuffs
 2015-12-24 19:01:30 -02:00
Douwe Maan 989131c530 Render milestone links as references 2015-12-24 14:43:07 +01:00
Grzegorz Bizon e1e39b61e5 Merge branch 'fix/ci-runners-token-persistence' into 'master' 
Fix method that ensures authentication token

Until now, `ensure_#{token_filed_name}!` method didn't persist new token in database.

This closes #4235.

See merge request !2185
 2015-12-23 12:07:37 +00:00
Grzegorz Bizon 3e6950481a Use method that creates runners registration token 
`runners_registration_token` now creates a new token if it is blank.
 2015-12-23 11:45:17 +01:00
Grzegorz Bizon e68ae9c6af Merge branch 'fix/ci-lint' into 'master' 
Make CI Lint form synchronous

This removes `remote: true` from CI Lint form, making it synchronous
form. This also removes some complexity related to displaying lint
messages.

View also has been updated, removed deprecated Bootstrap 2 tags.
Improved design.

See merge request !2171
 2015-12-23 10:43:32 +00:00
Grzegorz Bizon d74b254d97 Make CI Lint form synchronous 
This removes `remote: true` from CI Lint form, making it synchronous
form. This also removes some complexity related to displaying lint
messages.

View also has been updated, removed deprecated Bootstrap 2 tags.
Improved design.

Closes #4206
 2015-12-22 09:40:32 +01:00
Grzegorz Bizon 2ed7b964fa Rename CI lint specs file 2015-12-22 08:49:12 +01:00
Grzegorz Bizon aff713988b Improve CI Lint specs (refactoring) 2015-12-22 08:47:23 +01:00
Drew Blessing 66a8281fdd Fix and test leave project display 2015-12-21 15:58:42 -06:00
Kamil Trzcinski 742089ae04 Fix feature specs: we always show the build status if ci_commit is present 2015-12-17 17:51:22 +01:00
Douwe Maan 8eb51dc037 Fix updating and disabling merge button when Merge Immediately is clicked 2015-12-16 19:27:46 +01:00
Douwe Maan 79c90821ac Rename .issuable-details to .detail-page (and -header and -description) 2015-12-16 16:13:22 +01:00
Dmitriy Zaporozhets 40104746d6 Merge remote-tracking branch 'origin/feature/update-rubocop' 2015-12-16 13:44:50 +01:00
Grzegorz BizonandGrzegorz Bizon 8fe821cfa5 Trigger notes refresh in specs instead of waiting for ajax 2015-12-15 14:19:35 +01:00
Grzegorz BizonandGrzegorz Bizon 3e789eab8b Add minor fixes in note polling specs 2015-12-15 14:19:35 +01:00
Grzegorz BizonandGrzegorz Bizon 7c14541d2b Add feature specs for note polling 
Ref. #4032, !2084
 2015-12-15 14:19:35 +01:00
Gabriel Mazetto b5291f9599 Fixed Rubocop offenses 2015-12-15 00:53:52 -02:00
Grzegorz Bizon 4526515704 Merge branch 'ux/suppress-ci-yml-warning' into 'master' 
Suppress warning about missing `.gitlab-ci.yml` if builds are disabled

When user disables GitLab Ci Service in project's settings then warning
about missing `.gitlab-ci.yml` file should be supressed. This a matter
of user experience as stated in #3761 (closes #3761).

cc @ayufan 

See merge request !2014
 2015-12-14 17:16:29 +00:00
Grzegorz Bizon 6586856a15 Use a new admin runners path when reseting runners token 2015-12-14 14:03:58 +01:00
Grzegorz Bizon 76a17d4f54 Merge branch 'master' into ci/persist-registration-token 
* master:
  Move CI admin builds and runners specs to correct directory
  Fix 500 when viewing specific runners on runners page
  Fix Ci::Project migration not migrating columns that cannot be NULL
  Fix MySQL migration of CI emails
  Minor fix in flow 'Merge when build succeeds'
 2015-12-14 13:00:25 +00:00