summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactor Redis HA docs to also include Sentinelrefactor-sentinel-docsAchilleas Pipinellis2016-07-191-102/+248
| | | | [ci skip]
* Added Redis Sentinel support documentationGabriel Mazetto2016-07-142-1/+108
|
* Added Redis sentinel support to the CHANGELOGGabriel Mazetto2016-07-141-1/+2
|
* Synced mail_room.yml with the one in omnibusGabriel Mazetto2016-07-141-0/+4
| | | | | Added a comment to remember developers to open merge request to omnibus in future changes of the file.
* Codestyle changesGabriel Mazetto2016-07-132-17/+16
|
* Few minor fixes to Redis params order and commented out sentinel configGabriel Mazetto2016-07-132-13/+14
| | | | in resque.yml.example
* Fixed MailRoom specs and make sure it works with new resque.yml formatGabriel Mazetto2016-07-133-9/+12
|
* CodeStyleGabriel Mazetto2016-07-131-16/+16
|
* Fixed specs for Gitlab::Redis and code for Redis Sentinel supportGabriel Mazetto2016-07-134-30/+27
|
* Reverted resque.yml -> redis.yml renamingGabriel Mazetto2016-07-131-1/+1
|
* Small tweaksGabriel Mazetto2016-07-131-2/+1
|
* Make sidekiq get config settings from Gitlab::RedisConfigGabriel Mazetto2016-07-131-8/+6
|
* Specs for RedisConfigGabriel Mazetto2016-07-136-0/+125
| | | | Make sure :url is not present on RedisConfig.params after parsing
* Deduplicated resque.yml loading from several placesGabriel Mazetto2016-07-137-65/+159
| | | | We will trust redis configuration params loading to Gitlab::RedisConfig.
* Merge branch '19708-label-selection-clutter' into 'master' Jacob Schatz2016-07-121-1/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add margin to filter labels ## What does this MR do? Adds margin to filter labels ## Why was this MR needed? It was pretty ugly before ## What are the relevant issue numbers? Closes #19708 ## Screenshots (if relevant) ![Screen_Shot_2016-07-11_at_4.42.05_PM](/uploads/55c049e442a16a06c14bb9394137cc87/Screen_Shot_2016-07-11_at_4.42.05_PM.png) See merge request !5194
| * Add margin to filter labels19708-label-selection-clutterAnnabel Dunstone2016-07-111-1/+7
| |
* | Merge branch '19692-gray-block' into 'master' Jacob Schatz2016-07-121-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update header block class on snippets page ## What does this MR do? Changes gray block in `Snippets` to new white sub header style ## What are the relevant issue numbers? Closes #19692 ## Screenshots (if relevant) ![Screen_Shot_2016-07-11_at_4.17.10_PM](/uploads/f4cea2d019d30fc7c6adc7e3b26590b4/Screen_Shot_2016-07-11_at_4.17.10_PM.png) See merge request !5192
| * | Update header block class on snippets page19692-gray-blockAnnabel Dunstone2016-07-111-1/+1
| |/
* | Merge branch '17760-pipeline-builds-design' into 'master' Jacob Schatz2016-07-1217-119/+262
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Design updates for Builds & Pipelines" ## What does this MR do? Updates pipelines design ## What are the relevant issue numbers? Part of #18920 Closes #17760 Closes #18479 Closes #19618 ## Screenshots (if relevant) ![Screen_Shot_2016-07-11_at_2.44.22_PM](/uploads/5048928d86093802d84c3bd7f7c5dc85/Screen_Shot_2016-07-11_at_2.44.22_PM.png) ![Screen_Shot_2016-07-11_at_2.32.17_PM](/uploads/a7ab94c8042d33bd06ef633f62bf1c99/Screen_Shot_2016-07-11_at_2.32.17_PM.png) ![Screen_Shot_2016-07-11_at_2.44.43_PM](/uploads/8aa63229ad75d373c30f342d5c86c007/Screen_Shot_2016-07-11_at_2.44.43_PM.png) See merge request !5156
| * | Update duration representation on builds pagesAnnabel Dunstone2016-07-122-2/+2
| | |
| * | Update CHANGELOGAnnabel Dunstone2016-07-121-0/+1
| | |
| * | Fix label alignment bug; re-add build-linkAnnabel Dunstone2016-07-123-17/+20
| | |
| * | Add new stopwatch and commit icons; rename custom icon helper; fix commit ↵Annabel Dunstone2016-07-129-15/+31
| | | | | | | | | | | | pipeline layout
| * | Rearrange and update admin buildsAnnabel Dunstone2016-07-124-48/+47
| | |
| * | Update builds pageAnnabel Dunstone2016-07-123-57/+56
| | |
| * | Add link to pipline IDAnnabel Dunstone2016-07-121-1/+2
| | |
| * | Add empty deploy dropdown buttonAnnabel Dunstone2016-07-122-9/+46
| | |
| * | Set width on stage columns; min width on table with scroll on mobile; add ↵Annabel Dunstone2016-07-126-46/+93
| | | | | | | | | | | | avatar to commit column
| * | Move pipeline ID to commit column; add status; branch style updatesAnnabel Dunstone2016-07-123-7/+38
| | |
| * | Add clock and calendar icons for duration and finished at; add finished at ↵Annabel Dunstone2016-07-123-0/+9
| | | | | | | | | | | | section in pipelines
* | | Merge branch 'rs-delimit-done-todos' into 'master' Robert Speicher2016-07-121-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Use number_with_delimiter for Todos pending/done tab counts See merge request !5199
| * | | Use number_with_delimiter for Todos pending/done tab countsRobert Speicher2016-07-121-2/+2
| | | |
* | | | Merge branch 'rs-describe-symbols' into 'master' Robert Speicher2016-07-1240-98/+98
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Avoid `describe`-ing symbols in specs See merge request !5195
| * | | | Avoid `describe`-ing symbols in specsrs-describe-symbolsRobert Speicher2016-07-1241-110/+110
| | | | |
* | | | | Merge branch '18935-pipeline-button' into 'master' Jacob Schatz2016-07-121-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change new pipeline to run pipeline ## What does this MR do? Change text of button from `New pipeline` to `Run pipeline` ## What are the relevant issue numbers? Closes #18935 Part of #18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-06_at_12.15.36_PM](/uploads/2e0413b802118781dc5a29c7f1c105b8/Screen_Shot_2016-07-06_at_12.15.36_PM.png) See merge request !5119
| * | | | Change new pipeline to run pipeline18935-pipeline-buttonAnnabel Dunstone2016-07-061-1/+1
| | | | |
* | | | | Update CHANGELOG for 8.9.6Robert Speicher2016-07-121-2/+5
| |_|/ / |/| | | | | | | | | | | [ci skip]
* | | | Merge branch 'approval-required-todo' into 'master' Robert Speicher2016-07-125-7/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add approval required todos Ports the 'approval required' todo type from EE - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/547 See merge request !5217
| * | | | Add approval required todosapproval-required-todoSean McGivern2016-07-125-7/+14
| | | | |
* | | | | Merge branch '19659-sidebar-improvements' into 'master' Jacob Schatz2016-07-125-56/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Possible sidebar improvements based" ## What does this MR do? Cleans up the sidebar ## Are there points in the code the reviewer needs to double check? @dzaporozhets it looks like your screenshot has more padding on the left and right of the sidebar, but if you do that then the hamburger icon doesn't match the placement on the top nav, and it makes it look like icon is shifting back and forth. ## What are the relevant issue numbers? Part of #19659 ## Screenshots (if relevant) ![nav](/uploads/693d8a21bac464fc7dd40a51cb7dccda/nav.gif) See merge request !5211
| * | | | | Change sidebar drop shadow to rgba19659-sidebar-improvementsAnnabel Dunstone2016-07-122-2/+1
| | | | | |
| * | | | | Remove toggle partial; Move pin link to top of side navAnnabel Dunstone2016-07-124-35/+38
| | | | | |
| * | | | | Remove icons from sidebar; remove darker theme color from pin & toggle buttonsAnnabel Dunstone2016-07-123-22/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'remove-hound-config' into 'master' Stan Hu2016-07-123-99/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Hound CI and Teatro config ## What does this MR do? Since we moved to gitlab.com we don't use Hound CI and Teatro anymore. Instead we have rubocop. See merge request !5089
| * | | | | Remove teatro configremove-hound-configRobert Schilling2016-07-052-95/+0
| | | | | |
| * | | | | Remove hound configRobert Schilling2016-07-051-4/+0
| | | | | |
* | | | | | Merge branch 'lock_for_issuable' into 'master' Douwe Maan2016-07-1210-14/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimistic locking for Issue and Merge Requests ## What does this MR do? It implements Optimistic Locking http://api.rubyonrails.org/classes/ActiveRecord/Locking/Optimistic.html for Issues and MRs but in a bit custom way. We use it for cases when either title or description field is involved in the change. ## Why was this MR needed? We have to prevent data losing. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/12940 ## Screenshots (if relevant) ![Screen_Shot_2016-07-09_at_15.33.02](/uploads/2efbe547a12fda93bce347fa711438d7/Screen_Shot_2016-07-09_at_15.33.02.png) See merge request !5146
| * | | | | | Optimistic locking for Issue and Merge RequestsValery Sizov2016-07-1210-14/+78
| | | | | | |
* | | | | | | Merge branch 'cache-todos-finder-calls' into 'master' Robert Speicher2016-07-126-38/+62
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache todos pending/done dashboard query counts See #19273 See merge request !5175
| * | | | | | | Cache todos pending/done dashboard query countsPaco Guzman2016-07-126-38/+62
| | | | | | | |
View Lorry Controller Status