summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make the spec same with CE masterfeature/intermediate/12729-group-secret-variables-eeShinya Maeda2017-07-101-31/+29
* Merge branch 'rs-issue-34847' into 'master'Douwe Maan2017-07-101-7/+13
* Fix spec/models/group_spec.rb(Need to be backported to CE)Shinya Maeda2017-07-101-39/+35
* Fix variables_ee_spec.rbShinya Maeda2017-07-101-1/+1
* Use respond_toShinya Maeda2017-07-103-4/+4
* Disable environemt variable for Group-level variablesShinya Maeda2017-07-103-4/+5
* CE feature gropu-level variableShinya Maeda2017-07-1041-59/+760
* Merge branch 'rs-sign_in-ee' into 'master'Douwe Maan2017-07-09310-449/+438
|\
| * Merge branch 'master' into rs-sign_in-eeRobert Speicher2017-07-07134-487/+1882
| |\
| * | Change `sign_out` usage to `gitlab_sign_out` in one specRobert Speicher2017-07-071-4/+4
| * | Merge branch 'master' into rs-sign_in-eeRobert Speicher2017-07-07276-2487/+6203
| |\ \
| * \ \ Merge branch 'master' into rs-sign_in-eeRobert Speicher2017-07-061262-8443/+23759
| |\ \ \
| * | | | Auto-correct ProjectPathHelper violationsRobert Speicher2017-07-06244-958/+875
| * | | | Add ProjectPathHelper copDouwe Maan2017-07-063-0/+93
| * | | | Change to sign_in / sign_out helpers for EE-specific casesRobert Speicher2017-06-2934-44/+45
| * | | | Remove instance variable assignment from `gitlab_sign_in` helperRobert Speicher2017-06-291-4/+4
| * | | | Change gitlab_sign_out to sign_out where possibleRobert Speicher2017-06-291-3/+3
| * | | | Remove gitlab_sign_out_direct helperRobert Speicher2017-06-292-7/+2
| * | | | Remove a duplicated test block from the result of a conflict resolutionRobert Speicher2017-06-291-26/+0
| * | | | Change gitlab_sign_in to sign_in where possibleRobert Speicher2017-06-29287-373/+396
* | | | | Merge branch 'increase-parallelism-of-geo-repository-sync-worker' into 'master'Douwe Maan2017-07-0812-464/+649
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Revert "Use a dedicated Sidekiq queue for Geo::ProjectSyncWorker"Douglas Barbosa Alexandre2017-07-071-2/+1
| * | | | Use a lower timeout for sync worker and renew it from within the loopDouglas Barbosa Alexandre2017-07-071-4/+16
| * | | | Refactor Geo::ProjectSyncWorkerDouglas Barbosa Alexandre2017-07-073-2/+52
| * | | | Refactor GeoRepositorySyncWorker#schedule_jobsDouglas Barbosa Alexandre2017-07-071-3/+1
| * | | | Fix GeoRepositorySyncWorker#projects_remain?Douglas Barbosa Alexandre2017-07-071-1/+1
| * | | | Update CHANGELOGDouglas Barbosa Alexandre2017-07-071-1/+1
| * | | | Ensure that we cancel the leasing when GeoRepositorySyncWorker finishesDouglas Barbosa Alexandre2017-07-071-5/+7
| * | | | Make Geo::BaseSyncService#update_registry clearerDouglas Barbosa Alexandre2017-07-071-9/+7
| * | | | Add CHANGELOGDouglas Barbosa Alexandre2017-07-071-0/+4
| * | | | Limit the number of concurrent projects that can be synchronizedDouglas Barbosa Alexandre2017-07-071-15/+92
| * | | | Use a dedicated Sidekiq queue for Geo::ProjectSyncWorkerDouglas Barbosa Alexandre2017-07-071-1/+2
| * | | | Make Geo::BaseSyncService#lease_key publicDouglas Barbosa Alexandre2017-07-073-6/+6
| * | | | Refactor Geo::BaseSyncService#update_registryDouglas Barbosa Alexandre2017-07-071-8/+10
| * | | | Use save! rather than save when updating registry informationDouglas Barbosa Alexandre2017-07-071-1/+1
| * | | | Memoize the value of Geo::BaseSyncService#primary_ssh_path_prefixDouglas Barbosa Alexandre2017-07-071-1/+1
| * | | | Remove useless subject definition on the Geo project sync worker specDouglas Barbosa Alexandre2017-07-071-2/+0
| * | | | Fix small typosDouglas Barbosa Alexandre2017-07-071-1/+1
| * | | | Doesn't sync if the project was synced after our scheduling timestampDouglas Barbosa Alexandre2017-07-074-10/+76
| * | | | Break Geo::RepositorySyncService into Repository/Wiki sync servicesDouglas Barbosa Alexandre2017-07-077-384/+375
| * | | | Add test for Geo::ProjectSyncWorker when project could not be foundDouglas Barbosa Alexandre2017-07-071-0/+4
| * | | | Use the Geo::ProjectRegistry factory on geo_repository_worker_spec.rbDouglas Barbosa Alexandre2017-07-071-36/+5
| * | | | Schedule a job to sync the project with a backoff delay of 5 minutesDouglas Barbosa Alexandre2017-07-072-36/+23
| * | | | Add Geo::ProjectSyncWorkerDouglas Barbosa Alexandre2017-07-072-20/+31
| * | | | Remnove unused constant from GeoRepositorySyncWorkerDouglas Barbosa Alexandre2017-07-071-1/+0
| * | | | Store the time the sync started before fetching the repositoriesDouglas Barbosa Alexandre2017-07-073-68/+85
* | | | | Merge branch 'mobile-members-ee' into 'master'Filipa Lacerda2017-07-078-56/+162
|\ \ \ \ \
| * | | | | Force mobile view for admin projectsClement Ho2017-07-071-1/+1
| * | | | | Add members-list class to admin projects pageClement Ho2017-07-071-2/+2
| * | | | | Fix conflictsClement Ho2017-07-071-15/+6
View Lorry Controller Status