summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fe-paginated-environments-api' into ↵paginate-environments-bundleFilipa Lacerda2017-02-162-0/+5
|\ | | | | | | | | | | | | | | 'paginate-environments-bundle' Integrate with new environments API See merge request !8954
| * First iterationFilipa Lacerda2017-02-151-0/+1
| |
| * Merge branch 'master' into fe-paginated-environments-apiFilipa Lacerda2017-02-123-16/+41
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (97 commits) convert js-cookie dependency to an npm module convert timeago.js dependency to an npm module remove vue from vendor since it is now in node_modules Add CHANGELOG file Stylize blockquote in notification emails Add js prefix to right sidebar Replace accidentally deleted metaclick Remove right padding from navbar-collapse on large screens Add changelog common_utils merge conflicts Set sidebar height to 100% if at top of page Set height of fixed sidebars with js Add sticky sidebar on wiki page Fix comment button test for slash commands Fix time tracking spec Fix issue boards sidebar alignment and sidebar toggle spec Fix failing conflicts test Fix build sidebar scrolling Refactor JS Fix pinned sidebar alignment ...
| * | Add route for environment folder and expose an APIGrzegorz Bizon2017-02-091-0/+4
| | |
* | | Merge branch 'add-auto-submited-header' into 'master'Sean McGivern2017-02-161-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Set `Auto-Submitted: auto-generated` header to emails Closes #20305 See merge request !9163
| * | | Set `Auto-Submitted: auto-generated` header to emailsSemyon Pupkov2017-02-151-0/+1
| | |/ | |/| | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20305
* | | Merge branch 'beautiful-karma-output' into 'master' Alfredo Sumaran2017-02-161-1/+2
|\ \ \ | | | | | | | | | | | | | | | | Make Karma output look nicer for CI See merge request !9165
| * | | Make Karma output look nicer for CI (!9165)winniehell2017-02-151-1/+2
| | | |
* | | | Merge branch 'fix-production-assets' into 'master' Alfredo Sumaran2017-02-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Only load istanbul plugin in development mode See merge request !9261
| * | | | only load istanbul plugin in development modeMike Greiling2017-02-151-1/+1
| |/ / /
* | | | Stop Pikaday using momentno-more-momentPhil Hughes2017-02-141-0/+1
|/ / /
* | | Merge branch 'cover-my-karma' into 'master' Clement Ho2017-02-142-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reintroduce coverage report for JavaScript Closes #27826 and #20757 See merge request !9133
| * | | Reintroduce coverage report for JavaScript (!9133)winniehell2017-02-112-0/+8
| |/ /
* | | only print errors and warnings from webpack dev serversilence-webpackSimon Knox2017-02-111-1/+2
|/ /
* | rspec_profiling: Discover the correct branch name in GitLab CINick Thomas2017-02-101-0/+8
| |
* | approve new dependenciesMike Greiling2017-02-091-0/+12
| |
* | upgrade to webpack 2.2.xMike Greiling2017-02-091-13/+14
| |
* | approve MIT license for wordwrap submoduleMike Greiling2017-02-091-0/+6
| |
* | upgrade babel to v6Mike Greiling2017-02-091-4/+1
| |
* | exclude node_modules from imports-loader wrapperMike Greiling2017-02-091-0/+1
|/
* Merge branch 'dz-create-nested-groups-via-ui' into 'master' Dmitriy Zaporozhets2017-02-091-0/+1
|\ | | | | | | | | Allow creating nested group via UI See merge request !8786
| * Allow creating nested group via UIdz-create-nested-groups-via-uiDmitriy Zaporozhets2017-02-071-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'remove-jquery-ui-sortable' into 'master' Jacob Schatz2017-02-081-1/+1
|\ \ | | | | | | | | | | | | Removed jQuery UI sortable See merge request !8478
| * | Removed jQuery UI sortableremove-jquery-ui-sortablePhil Hughes2017-02-061-1/+1
| |/
* | Revert "Merge branch 'fix-karma-coverage' into 'master'"revert-135b4f75Clement Ho2017-02-071-9/+1
| | | | | | This reverts merge request !9044
* | fix karma coverage reportMike Greiling2017-02-071-1/+9
| |
* | Merge branch ↵Kamil Trzciński2017-02-071-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pages' into 'master' Merge Triggers, Runners, Variables and Pipelines to a single option called "CI/CD Pipelines" Closes #26165 See merge request !8430
| * | Changed the controller/route name to 'ci/cd' and renamed the corresponding filesJose Ivan Vargas2017-02-061-1/+1
| | | | | | | | | | | | Added tests to verify the access policy to the new controller
| * | changed pipelines controller name to ci_cd_pipelinesJose Ivan Vargas2017-02-061-1/+1
| | |
| * | Converted the views to partials that compose the menu item "pipelines"Jose Ivan Vargas2017-02-061-0/+1
| | |
* | | Merge branch 'fe-commit-mr-pipelines' into 'master' Fatih Acet2017-02-061-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Use vue.js Pipelines table in commit and merge request view Closes #27141 See merge request !8844
| * | Use webpack to require filesFilipa Lacerda2017-02-051-0/+1
| |/ | | | | | | Changes after review
* | Merge branch 'remove-sidekiq-backup-ar-threads' into 'master' Douwe Maan2017-02-061-3/+1
|\ \ | | | | | | | | | | | | | | | | | | Don't use backup AR connections for Sidekiq Closes #27713 See merge request !9001
| * | Don't use backup AR connections for Sidekiqremove-sidekiq-backup-ar-threadsYorick Peterse2017-02-061-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding two extra connections does nothing other than increasing the number of idle database connections. Given Sidekiq uses N threads it can never use more than N AR connections at a time, thus we don't need more. The initializer mentioned the Sidekiq upgrade guide stating this was required. This is false, the Sidekiq upgrade guide states this is necessary for Redis and not ActiveRecord. On GitLab.com this resulted in a reduction of about 80-100 PostgreSQL connections. Fixes #27713
* | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-068-32/+319
|\ \ \ | |/ / | | | | | | # Conflicts: # db/schema.rb
| * | transpile all javascript files with babelMike Greiling2017-02-061-2/+2
| |/
| * Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-033-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (181 commits) Fixed adding to list bug Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Fixed modal lists dropdown not updating when list is deleted Fixed remove btn error after creating new issue in list Removed duplicated test Removed Masonry, instead uses groups of data Uses mixins for repeated functions Fixed up specs Props use objects with required & type values Removes labels instead of closing issue when clicking remove button Fixed JS lint errors Fixed issue card spec Added webkit CSS properties Fixed bug with empty state showing after search Fixed users href path being incorrect Fixed bug where 2 un-selected issues would stay on selected tab Fixed DB schema Changed how components are added in objects Added remove button Add optional id property to the issue schema Fixed issue link href Disabled add issues button if no lists exist ...
| | * Reuse endpoint to list issues for a list instead of create a new oneDouglas Barbosa Alexandre2017-02-031-3/+1
| | |
| | * Used issue bulk update instead of different endpointPhil Hughes2017-02-031-1/+0
| | |
| | * Changed where data gets loadedPhil Hughes2017-02-031-1/+2
| | | | | | | | | | | | Changed what is hidden when data is loading
| | * Add issues to boards listPhil Hughes2017-02-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This removes the backlog list & instead creates a modal window that will list all issues that are not part of a list for easy adding onto the board Closes #26205
| * | consistently use single quotesMike Greiling2017-02-021-3/+3
| | |
| * | DRY with Gitlab.config.webpack.dev_server referenceswebpackMike Greiling2017-02-021-10/+12
| | |
| * | Merge branch 'master' into webpackMike Greiling2017-02-022-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (63 commits) Use `add_$role` helper in snippets specs removes old css class from everywhere Fixes broken build: Use jquery to get the element position in the page Check public snippets for spam Keep snippet visibility on error Update pipeline and commit URL and text on CI status change Support non-ASCII characters in GFM autocomplete Active tense test coverage Fix filtered search manager spec teaspoon error Reduce the number of loops that Cycle Analytics specs use Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion. update spec Change the reply shortcut to focus the field even without a selection. use destroy_all Remove settings cog from within admin scroll tabs; keep links centered add changelog remove old project members from project add spec replicating validation error Improve styling of the new issue message Don't capitalize environment name in show page ...
| * | | disable webpack proxy in rspec environment due to conflicts with webmock gemMike Greiling2017-02-021-12/+20
| | | |
| * | | configure webpack dev server port via environment variableMike Greiling2017-02-011-10/+2
| | | |
| * | | add rack middleware to proxy webpack dev serverMike Greiling2017-02-014-0/+42
| | | |
| * | | remove dev-server config from development environmentMike Greiling2017-01-311-7/+0
| | | |
| * | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-311-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (83 commits) Fix small typo on new branch button spec Abillity to promote project labels to group labels Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. cop for gem fetched from a git source Add CHANGELOG entry Remove new branch button for confidential issues Remove flash warning from login page add complete changelog Add project ID index to `project_authorizations` table to optimize queries Fix disable storing of sensitive information when importing a new repo Fix notification when global=disabled, group=watch Ensure rake is called within the correct bundle context Fix 8.16.0 release date. Improve search within group logic Add changelog item about new attributes in group api Update group api doc with full_name and full_path attributes Add tests for nested groups in search service and search helper ...
| * \ \ \ Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-283-13/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (33 commits) Improved code style on the issue_sidebar_spec.rb add CHAGELOG.md entry for !8831 remove assets:compile step from relative_url docs update scripts and docs to reference the newly namespaced rake task namespace assets rake tasks to gitlab:assets:* correct gzip files if they exist as well automatically correct CSS urls on assets:precompile remove hard-coded assets path for ace editor modules Fixed cancel button in the services form not redirecting back to the integrations settings view Fix search bar search param encoding Fix a transient failure in the `Explore::ProjectsController` spec Fix filtering with multiple words Fix project name label's for reference in project settings Fixed merge request tabs extra margin Don't call `#uniq` on a relation Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/ Move ApplicationSetting DEFAULTS to `.defaults` instead Move a begin/rescue clause to ApplicationSetting.expire Use badge partial as single source of truth instead of having 2 partials doing the same Changes after review ...
View Lorry Controller Status