summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix LDAP documentation and example configmk-fix-ldap-ca-file-docsMichael Kozono2017-07-312-4/+4
|
* Merge branch '29385/add_shrug_command' into 'master'Rémy Coutable2017-07-319-7/+225
|\ | | | | | | | | | | | | Fixes #29385: Add /shrug and /tableflip commands Closes #29385 See merge request !10068
| * Fixes #29385: Add /shrug and /tableflip commandsAlex Ives2017-07-289-7/+225
| | | | | | | | | | | | | | | | | | | | - Updated DSL to support substitution definitions - Added substitution definition, inherits from command definition - Added tabelflip and shrug substitutions to interpret service - Added support for substitution definitions to the extractor for preview mode. - Added substitution handling in the interpret service Signed-off-by: Alex Ives <alex@ives.mn>
* | Merge branch '35482-dropdown' into 'master'Annabel Dunstone Gray2017-07-311-4/+4
|\ \ | | | | | | | | | | | | | | | | | | fix :focus styles for selected filter dropdown items Closes #35482 See merge request !13070
| * | fix :focus styles for selected filter dropdown items35482-dropdownSimon Knox2017-07-251-4/+4
| | |
* | | Merge branch 'win-newnav-badges-firefox' into 'master'Phil Hughes2017-07-312-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix badge positioning in new navigation for Firefox Closes #35634 See merge request !13186
| * | | Fix badge positioning in new navigation for Firefoxwin-newnav-badges-firefoxwinh2017-07-312-3/+3
| | | |
* | | | Merge branch '34679-enhance-pt-br' into 'master'Rémy Coutable2017-07-311-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enhance pt-BR translation in Project and Repository pages Closes #34679 See merge request !13093
| * | | | Enhance pt-BR translation in Project and Repository pagesPaulo Bezerra2017-07-251-7/+7
| | | | |
* | | | | Merge branch 'rs-deduplicate-notification-service-spec' into 'master'Rémy Coutable2017-07-311-37/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | De-duplicate two specs in spec/services/notification_service_spec See merge request !13168
| * | | | | De-duplicate two specs in spec/services/notification_service_specrs-deduplicate-notification-service-specRobert Speicher2017-07-281-37/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two specs that were testing the exact same thing as the spec above it, but with additional expectations. So we opted to keep the "more expectations" tests and deleted the duplicates. We've also deleted one nested `before` block that was duplicating setup of its parent context.
* | | | | | Merge branch 'dm-ldap-authentication-ssl-verification' into 'master'Sean McGivern2017-07-312-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor Closes #35752 See merge request !13185
| * | | | | | Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptordm-ldap-authentication-ssl-verificationDouwe Maan2017-07-312-1/+5
| | | | | | |
* | | | | | | Merge branch 'breadcrumbs-collapsed-title-width-fix' into 'master'Filipa Lacerda2017-07-312-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed breadcrumb titles aggressively collapsing Closes #35323 See merge request !13166
| * | | | | | | Fixed breadcrumb titles aggressively collapsingbreadcrumbs-collapsed-title-width-fixPhil Hughes2017-07-282-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #35323
* | | | | | | | Merge branch 'docs-new-topic-user-project-index' into 'master'Job van der Voort2017-07-316-10/+118
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New doc topic user/project/index Closes #33579 See merge request !12609
| * | | | | | | | New doc topic user/project/indexMarcia Ramos2017-07-316-10/+118
|/ / / / / / / /
* | | | | | | | Merge branch 'cherry-pick-41db362c' into 'master'Rémy Coutable2017-07-311-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2' See merge request !13170
| * | | | | | | Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2'cherry-pick-41db362cRémy Coutable2017-07-281-1/+3
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Impersonation Tokens creation spec failure in admin_users_impersonation_tokens_spec.rb" See merge request !13145
* | | | | | | Merge branch 'inline-js-removal-projects-other' into 'master'Phil Hughes2017-07-3113-113/+140
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline js removal projects other See merge request !13075
| * | | | | | | Moved the duplicate Available Refs to a default in RefSelectDropdowninline-js-removal-projects-otherTim Zallmann2017-07-282-3/+4
| | | | | | | |
| * | | | | | | Updated Event Handlers based on MR discussionTim Zallmann2017-07-281-8/+8
| | | | | | | |
| * | | | | | | Left a bracket in the line :-/Tim Zallmann2017-07-271-1/+1
| | | | | | | |
| * | | | | | | Fixed the strange escapingTim Zallmann2017-07-271-1/+1
| | | | | | | |
| * | | | | | | Maybe that fixes the escaping in the URLTim Zallmann2017-07-271-1/+1
| | | | | | | |
| * | | | | | | Revert "Due to more async loading the tests could fail, trying to fix it ↵Tim Zallmann2017-07-271-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with wait_for_requests" This reverts commit 0c33f384bb2fd2bd97efa4d3fec2888393683fb1.
| * | | | | | | Due to more async loading the tests could fail, trying to fix it with ↵Tim Zallmann2017-07-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wait_for_requests
| * | | | | | | Fixes New Project BugTim Zallmann2017-07-273-5/+5
| | | | | | | |
| * | | | | | | Converted Pipelines ChartsTim Zallmann2017-07-274-50/+47
| | | | | | | |
| * | | | | | | TreeContent moved to external JSTim Zallmann2017-07-272-7/+4
| | | | | | | |
| * | | | | | | Moved Inline JS for Pipelines Charts + new Pipeline to dispatcherTim Zallmann2017-07-275-5/+39
| | | | | | | |
| * | | | | | | Changed the data for New Tag to a script blockTim Zallmann2017-07-272-6/+2
| | | | | | | |
| * | | | | | | Inline JS of Wiki Sidebar to dispatcherTim Zallmann2017-07-272-3/+1
| | | | | | | |
| * | | | | | | Set New Tags to ignore Inline JSTim Zallmann2017-07-271-0/+1
| | | | | | | |
| * | | | | | | Project New moved to external FileTim Zallmann2017-07-273-43/+46
| | | | | | | |
* | | | | | | | Merge branch '35672-edge-top-bar' into 'master'Phil Hughes2017-07-312-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix top bar in jobs view for microsoft edge Closes #35672 See merge request !13175
| * | | | | | | | Fix top bar in jobs view for microsoft edge35672-edge-top-barFilipa Lacerda2017-07-292-0/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'protobuf-bump' into 'master'Sean McGivern2017-07-311-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump google-protobuf to 3.3.0 See merge request !13172
| * | | | | | | | | Bump google-protobuf to 3.3.0protobuf-bumpMatija Čupić2017-07-291-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix/sm/schema-fix-group-pipeline-schedule-variables' into 'master'Sean McGivern2017-07-311-10/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix db/schema.rb for ci_group_variables and ci_pipeline_schedule_variables See merge request !13161
| * | | | | | | | | fixfix/sm/schema-fix-group-pipeline-schedule-variablesShinya Maeda2017-07-291-10/+10
| |/ / / / / / / /
* | | | | | | | | Merge branch '34870-move-performance-bar-to-top' into 'master'Phil Hughes2017-07-3116-24/+111
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the Performance Bar to the top instead of being at the bottom Closes #35019 and #34870 See merge request !12946
| * | | | | | | | | Moves the Performance Bar to the top instead of being at the bottomRémy Coutable2017-07-3116-24/+111
|/ / / / / / / / /
* | | | | | | | | Merge branch 'gitaly-398-git-garbage-collect' into 'master'Sean McGivern2017-07-313-12/+97
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate GitGarbageCollectWorker to Gitaly Closes gitaly#398 See merge request !12975
| * | | | | | | | Migrate GitGarbageCollectWorker to Gitalygitaly-398-git-garbage-collectKim "BKC" Carlbäcker2017-07-283-12/+97
| | | | | | | | |
* | | | | | | | | Merge branch '35567-fix-relative-urls-in-webpack-public-path' into 'master'Douwe Maan2017-07-312-1/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix relative_url_root support for webpack chunks Closes #35567 See merge request !13165
| * | | | | | | | | add CHANGELOG.md entry for !1316535567-fix-relative-urls-in-webpack-public-pathMike Greiling2017-07-281-0/+5
| | | | | | | | | |
| * | | | | | | | | fix relative_url_root support for webpack chunksMike Greiling2017-07-281-1/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-user-creation-doc' into 'master'Achilleas Pipinellis2017-07-311-20/+20
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation of user creation by replacing the 'confirm' param with 'skip_confirmation' Closes #35614 See merge request !13160
| * | | | | | | | | | Update documentation of user creation by replacing the 'confirm' param with ↵Dan Dunckel2017-07-281-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'skip_confirmation'
View Lorry Controller Status