Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix inconsistent punctuation on MR form | Bob Van Landuyt | 2018-03-12 | 1 | -19/+89 |
| | |||||
* | Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-fe | Douwe Maan | 2018-03-07 | 1 | -3/+93 |
|\ | | | | | | | # Conflicts: # locale/gitlab.pot | ||||
| * | Allow maintainers to edit directly in a fork | Bob Van Landuyt | 2018-03-07 | 1 | -38/+113 |
| | | |||||
* | | CE backport for creating CI/CD projects from GitHub | Rubén Dávila | 2018-03-07 | 1 | -35/+92 |
|/ | |||||
* | Merge branch 'bvl-port-of-ee-translations' into 'master' | Douwe Maan | 2018-03-06 | 19 | -1632/+21535 |
|\ | | | | | | | | | Port of ee translations See merge request gitlab-org/gitlab-ce!17526 | ||||
| * | Merge branch 'master-i18n' into 'master' | Douwe Maan | 2018-03-05 | 19 | -1632/+21535 |
| | | | | | | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!4823 | ||||
* | | CI/CD-only projects FE | Eric Eastwood | 2018-03-05 | 1 | -2/+50 |
|/ | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839 Conflicts: app/assets/javascripts/projects/project_new.js app/views/shared/_import_form.html.haml ee/app/controllers/ee/projects_controller.rb ee/spec/features/projects/new_project_spec.rb locale/gitlab.pot | ||||
* | Add some strings that were missing in gitlab.potbvl-add-missing-externalized-strings | Bob Van Landuyt | 2018-03-01 | 1 | -26/+148 |
| | |||||
* | Port `read_cross_project` ability from EE | Bob Van Landuyt | 2018-02-22 | 1 | -5/+128 |
| | |||||
* | Merge branch 'master-i18n' into 'master' | Douwe Maan | 2018-02-13 | 16 | -2933/+17627 |
| | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!4481 | ||||
* | Annotate charts page for internationalization | Shah El-Rahman | 2018-02-08 | 1 | -0/+27 |
| | |||||
* | Annotate graph page for internationalization | Shah El-Rahman | 2018-02-08 | 1 | -2/+11 |
| | |||||
* | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master' | Robert Speicher | 2018-02-07 | 17 | -17/+17 |
|\ | | | | | | | | | | | | | Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182 | ||||
| * | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480 | Mike Greiling | 2018-02-06 | 1 | -77/+253 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (242 commits) Validate user namespace before saving so that errors persist on model Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd Downgrade google-protobuf Close low level rugged repository in project cache worker File upload UI obeys LFS filters Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page" Upgrade GitLab Workhorse to v3.6.0 Add sorting options for /users API (admin only) improvements from feedback [ci-skip] add changelog remove file after `Upload#destroy` Fix a hardcoded pipeline ID in a spinach step Override group sidebar links Replace "cluster" with "Kubernetes cluster" Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently Fix tests for Drop filename enforcement Revert using expand_fixture_path in factory Revert "Add FixtureHelpers for FactoryGirl" Refactor :trace to :trace_live in spec ... | ||||
| * | | change prometheus service description text to match design | Mike Greiling | 2018-01-31 | 17 | -17/+17 |
| | | | |||||
* | | | Translate issuable sidebar34416-issue-i18n | Jarka Kadlecová | 2018-02-07 | 1 | -2/+170 |
| |/ |/| | |||||
* | | Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clusters | Winnie Hellmann | 2018-02-06 | 1 | -66/+129 |
| | | |||||
* | | Allow moving wiki pages from the UI | Francisco Javier López | 2018-02-05 | 1 | -11/+124 |
| | | |||||
* | | Change "CI configuration" in "CI/CD configuration"42684-set-up-ci-set-up-ci-cd | bikebilly | 2018-02-02 | 1 | -1/+1 |
| | | |||||
* | | Change "Set up CI" to "Set up CI/CD" | bikebilly | 2018-02-01 | 1 | -1/+1 |
|/ | |||||
* | Gitaly Server info for admin panel | Zeger-Jan van de Weg | 2018-01-31 | 1 | -92/+400 |
| | | | | | | | | | | | | Implements the client side for gitlab-org/gitaly#819. Which is a server info command. This checks the server version and git binairy version on the server. A small UI was added for administrators, so they can check the status of the Gitaly server. This is done for each storage the monolith knows. Because of this commit, gitlab-org/gitlab-ce!15580 is now closed. That MR removed the Git version too, but didn't replace it with anything. | ||||
* | Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service" | Fabio Busatto | 2018-01-25 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master-i18n' into 'master' | Douwe Maan | 2018-01-05 | 16 | -1059/+9141 |
| | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!3930 | ||||
* | Rename GKE as Kubernetes Engine | Takuya Noguchi | 2017-12-06 | 17 | -180/+180 |
| | |||||
* | Update externalized strings pot | Matija Čupić | 2017-12-05 | 1 | -22/+158 |
| | |||||
* | Merge branch '35616-move-k8-to-cluster-page' into ↵ | Kamil Trzcinski | 2017-12-05 | 10 | -338/+2861 |
|\ | | | | | | | cluster-page-with-list-clusters | ||||
| * | Merge branch 'master-i18n' into 'master' | Douwe Maan | 2017-12-04 | 10 | -338/+2861 |
| | | | | | | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!3378 | ||||
* | | Update toggle button text in show page | Filipa Lacerda | 2017-12-02 | 1 | -4/+347 |
|/ | |||||
* | Resolve "Fix GKE wording" | Fabio Busatto | 2017-11-07 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master-i18n' into 'master' | Douwe Maan | 2017-11-06 | 15 | -1346/+5585 |
| | | | | | | | New Crowdin translations Closes gitlab-ce#39377 See merge request gitlab-org/gitlab-ee!3179 | ||||
* | Remove superfluous namespace from cluster settingsjramsay-remove-superfluous-namespace | James Ramsay | 2017-10-22 | 1 | -9/+66 |
| | |||||
* | Merge branch 'master-i18n' into 'master' | Douwe Maan | 2017-10-19 | 15 | -1147/+8176 |
| | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!3030 | ||||
* | Merge branch 'master' into bvl-group-trees | Bob Van Landuyt | 2017-10-10 | 1 | -5/+233 |
|\ | |||||
| * | Show fork information on the project panel | Bob Van Landuyt | 2017-10-07 | 1 | -2/+76 |
| | | |||||
| * | Fix almost all unresolved comments from Docs and UX review | Kamil Trzcinski | 2017-10-05 | 1 | -5/+5 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2017-10-05 | 1 | -3/+3 |
| |\ | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| | * | Fix inconsistent use of sentence casejramsay-fix-file-list-title-case | James Ramsay | 2017-10-04 | 1 | -14/+8 |
| | | | |||||
| * | | Adds i18n pot file | Filipa Lacerda | 2017-10-05 | 1 | -11/+131 |
| |/ | |||||
* | | Adjust wording on the Group-show page | Bob Van Landuyt | 2017-10-10 | 1 | -11/+166 |
|/ | |||||
* | Merge branch 'translation-timeago-a-while-ago' into 'master' | Douwe Maan | 2017-10-02 | 1 | -1/+1 |
|\ | | | | | | | | | Fix translation for 'a while' => 'in a while' See merge request gitlab-org/gitlab-ce!14433 | ||||
| * | Fix translation for 'in a while'translation-timeago-a-while-ago | Kim "BKC" Carlbäcker | 2017-09-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master-i18n' into 'master' | Douwe Maan | 2017-10-01 | 15 | -778/+4918 |
| | | | | | | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!2947 | ||||
* | | Merge branch 'jramsay-4012-externalize-wiki-strings' into 'master'38609-generalise-pop-overs-to-work-on-hover-and-implement-in-existing-places | Douwe Maan | 2017-09-29 | 1 | -2/+128 |
|\ \ | | | | | | | | | | | | | Add translatable strings to wiki pages See merge request gitlab-org/gitlab-ce!14534 | ||||
| * | | Add translatable strings to wiki pagesjramsay-4012-externalize-wiki-strings | James Ramsay | 2017-09-28 | 1 | -2/+128 |
| | | | |||||
* | | | Tweaked the first time contributor tooltip textfirst-time-contributor-tooltip-text | Phil Hughes | 2017-09-28 | 1 | -1/+1 |
|/ / | | | | | | | Removes the text `Handle with care` as it sounds condescending. | ||||
* | | Fixed missing namespaces on navigation translationsfix-translation-namespaces | Phil Hughes | 2017-09-27 | 1 | -7/+7 |
| | | |||||
* | | Generates locale/gitlab.pot3523-i18n-autodevops | Filipa Lacerda | 2017-09-27 | 1 | -19/+187 |
| | | |||||
* | | Add unextracted strings for i18n32782-i18n-support-pagination | kushalpandya | 2017-09-21 | 1 | -75/+94 |
|/ | |||||
* | Merge branch 'master-i18n' into 'master' | Douwe Maan | 2017-09-18 | 15 | -103/+1829 |
| | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!2929 | ||||
* | Change strings for projects dropdown placeholder and error state37513-projects-dropdown-copy-tweaks | Chris Peressini | 2017-09-07 | 1 | -0/+18 |
| | | | | gitlab-ce#37513 |